Fix merge conflicts and version bump