conflictResolutionPlan