Chapter 9

Yet still resolving conflicts