Conflict and Cohesion

Errata

None noted so far.