new test1
new master
...
Merge branch 'new_feature'
add to feature2
add to master
Merge branch 'feature2'
change in branch2
modify file2
change file2 in branch
fix merge