Conflict Manual Outline Review and Submission

bodhi5734