Remove merge.ff=only