pod install to fix merge
pod install to fix merge

icapps/swiftGenericWebService,icapps/ios-faro,icapps/ios-air-rivet,icapps/ios-faro,icapps/ios-air-rivet,icapps/ios-air-rivet,icapps/ios-air-rivet,icapps/ios-faro,icapps/ios-faro,icapps/ios-air-rivet