add in feature1 branch
Conflict exercise on master branch
conflict fixed