Fix merge weirdness.