merge is coming back next week