Conflict resolution view 1