attempting to create a conflict in lesson3
fixed conflict with master
pretty much finished the initial lesson