branch test
AND simple
& sumple
conflict fixed
AND simple
& simple
AND simple
or simple
Merge branch 'master' into feature1

Conflicts:
	readme.txt
change a to an
yes but...
see what will
then...what?
add merge
Merge branch 'dev'
add merge with no-ff
merge with on-ff
remove readme4.txt