add conflicting content for ch. 1