branch test
AND simple
& simple
conflict fitxed
add a line
merge with no-ff
fix bug 101
merged bug fix 101
add hello.py & readme.txt
branch test
haha
Merge branch 'dev'
AND simple
& simple
Merge branch 'feature1'

Conflicts:
	readme.txt
add merge
merge with no-ff