feature1
branch master
conflict fixed
confilict
Conflict fixed
add merge
merge with no-ff