Inc version.
Fix merge conflicts wrt version changes.