modified test.txt
modified test.txt on master
conflict fixed
modified test on dev branch
merge with no-ff
fixed the bug 101
merge fixed bug 101
modefied dev.txt
test
--no-ff again