added break for failed merge