Carried on with chapter 6 of PiH.
Resolved conflict.