chp03 revisit
conflict solve