Updated bump-version.
BLD: Resolved conflict.