remove bad if statement from merge