user conflict message updated