branch test
AND simple
& simple
Merge branch 'dev'

Conflicts:
	README.md
conflict fixed
you are the one
you are the two
conflict merge
done
merge no-ff
--no-ff