lesson 3 in progress
fixed conflict