re-inject vclock after conflict resolution.

With the check now in the converter, we need to re-inject
the vclock after a ConflictResolver is run. Again this
frees the user from have to manually copy the vclock
in their resolver.