when merging don't fast-forward/commit