Get ready for the merge