Conflict Management (Extended) Updated