Weird merge typo error