fiddling with the intro to ch. 7
ch.2 confilct resolved