add merge
merge witch no-ff