Unset merge.ff