Updated conflict message warnings.