add dev.txt on dev branch
add four
add three again
conflict fixed
add mytest.txt
add merge
merge with no-ff
fix bug 101
merge bug fix 101
update dev.txt
conflict fix