branch test
AND simple
& simple
conflict fixed
add
merge with no-ff
fix bug 101
merged bug fix 101
dd
Merge branch 'dev'

Conflicts:
	README.md