add feature1
fixing bug
bla
fixed
Merge branch 'bug1234'
feature 1
Merge branch 'feature2'
Merged
Merged
Merged
Merged
Added feature3
Added file1