conflict resolved in user