install hub
set merge --nno-ff as default