Conflict Resolution
UPDATED
