merge and version bump