feature1
simple
next line
Merge branch 'feature1'

Conflicts:
	readme.txt
test stash