Fix all the weirdness that merging does...