remove extra #end if from merge :D