Fix positioning of line in a merge conflict