Trouble with merge