Fixing merge conflict with iOS deployment number.