add new.txt
merge with no-ff