clear merge error