removed the conflict message