Control chapter.
Fix conflicts.