Fixed lingering if from merge