add merge1
Merge branch 'dev'
add merge2.txt
add merge3.ttx
merge with no-ff
fix bug
merge fixed bugs
co