Conflict
Resolved