branch test
AND simple
& simple
Merge branch 'feature1'
conflict fixed
Conflicts:
	README.md
add merge
merge with no-ff