Added feature1
Added feature2
Added additional features to feature2
Merged feature2_additional into master
Added feature3
Fixed bug #1234
Really fixing bug 1234
Corrected file1.txt conflicts2