merge gone bad