Prepare the merge