Fix merge massacre mayhem.