always use non fast-forward merge strategy