this is a branch commit
branch test
AND simple
AND simple
Merge branch 'feature1'

Conflicts:
	readme.txt
add merge
merge with no-ff