remove merge conflict message