adding lines on feature branch
Merge branch 'feature1'
merged feature1 into master