remove --no-ff setting.