correcting missing line from merge conflict