CocoaPodsで$ pod installしたときになにやら
[!] Pod::Executable pull
Auto-merging geos/3.4.2/geos.podspec
CONFLICT (add/add): Merge conflict in geos/3.4.2/geos.podspec
Auto-merging Typhoon/1.6.6/Typhoon.podspec
みたいなエラーがずらずら出たので、'pod install conflict'でググったら解決法が出た。
http://blog.cocoapods.org/Repairing-Our-Broken-Specs-Repository/
$ sudo rm -fr ~/.cocoapods/repos/master
$ pod setup