[6.1] Fix an infinite loop if a conflict marker is found but it's not at the start of a new line#2901