clear merge conflicts