new feature
Merge branch 'bug/1'
will create merge conflict 1
will create merge conflict 2