Merging the wrong way