Update podspec
Fix merge