sicp 2.69-2.72
fixed conflict