Conflict Resolution 2

Conflict resolution

Conflict Resolution