合并
Merge without fastmode
merge with no-ff