Conflict resolution management