new
branch2
feature1
master
conflict fixed
branch3
merge with no-ff