Fixed merge weirdness