Merge conflict resolved and a version bump.