2.txt 增加
merge with no-ff
go