list users
resolve conflict