remove merge conflict line