DD 16: Conflict Resolution