CML003 Conflict Resolution