Merge was trivial (except for the conflict from a graft about dirstate that could be safely discarded)