Fixed conflict message