Remove rogue conflict message