merge is coming back next week - good to know