branch test
feature1 branch
master branch commit
conflict fixed
add merge by dev branch
merge with no-ff
fix bug
merged bug fix 01
aaaaaaaaaasdkfj