fixes and podspec
fixes and podspec
fix merge
podspec