Don’t fast-forward when merging