ch 18 answer
ch 18 fix conflicts