remove merge conflict artifacts