only fast-forward merge by default