Conflict resolution in multi-agent hybrid systems