Conflict resolution-2