Preparing a merge