Title: Distributed and Centralized Conflict Management under Traffic Flow Management Constraints