Preparing the merge