branch test
AND simple
and simple
Merge branch 'feature1'

Conflicts:
	readme.txt
add merge
merge with no-ff
AND simple
& simple
conflict fixed