fix weird if statements from merge