minor change
Conflict resolution