Update counts and version ahead of most recent pull requests.
Resolving conflict.