remove merge conflicts.