IOS

Resolve merge conflict with pass for iOS