Conflict resolution for air traffic management: a study in multi-agent hybrid systems