i hate merge