Always merge without ff