Don't commit or fast-forward merges