Pass the resolved count in merge-conflicts:resolved.

Make it easier for subscribers to be stateless.