Users conflicts resolved