& simple
change on brance
"change on master"
Merge branch 'feature1'

Conflicts:
	ReadMe.txt
add merge
merge with no-ff
second
third
last time