role
resolve conflict