indenced the code
add a line new feature
master branch add a line
conflict fixed
developed some new features
add some new features in master
merged feature1
to try fast-forward merge
Merge branch 'feature1'
master commit after fast-forward merge