Conflict resolution view 2