new content for file1
added feature 1
Fixed bug#1234
added feature2
really fixing bug1234
additional changes
merged feature2additional
added feature 3
merged feature3
merged bug1234: