BMT-2660 - Conflict Management