Podspec update
Version update
Fixing merge conflict