branch test change test.txt
new branch feature
after create feature and commit then checkout to master and change test.txt
conflict fixed
add new branch dev to test other merge
merge with no-ff