Conflict resolution view 3