resolved merge conflicts
resolved merge conflicts

AzureAD/microsoft-authentication-library-for-objc,AzureAD/microsoft-authentication-library-for-objc,AzureAD/microsoft-authentication-library-for-objc,AzureAD/microsoft-authentication-library-for-objc,AzureAD/microsoft-authentication-library-for-objc