Hmm, bad merge apparently. Fixing a couple of compile errors that didn't show up when trying to merge master into the callbacks branch.
Hmm, bad merge apparently. Fixing a couple of compile errors that didn't show up when trying to merge master into the callbacks branch.

BranchMetrics/ios-branch-deep-linking,BranchMetrics/ios-branch-deep-linking,BranchMetrics/ios-branch-deep-linking,BranchMetrics/iOS-Deferred-Deep-Linking-SDK,BranchMetrics/iOS-Deferred-Deep-Linking-SDK,BranchMetrics/ios-branch-deep-linking