fixing deleted line after last merge