Merge Conflict Resolution

Research