Added feature1
Fixed bug1234
Really fixing bug#1234
merge with bug#1234
Added feature3