Merge weirdness