Upgrading podspec
Merge conflicts