add merge
merge with no-ff

Conflicts:
	readme.txt
readme master