get ready for the merge