CR
Conflict Resolution