fix the world's worst merge