Fix merge weirdness