remove merge conflict lines.