A logic-based approach to conflict resolution