turn off fast-forward when merging