Minor: merging now won't commit by default