remove merge conflict marker