Conflict Manual Rough Draft Review

bodhi5734