add merge
merg with no-ff

Conflicts:
	readme.txt