iOS Merge fix.