add line 1
add line
add
Merge branch 'feature1'
add line
add line
conflict fixed
add merge
merge with no-ff