remove merge conflict