remove rebase conflict line.