remove merge conflicts