remove merge conflict message. No CR