CPD Conflict Management