Trouble with the merge