missed line of text while solving merge conflicts