All in Conflict resolution