Fixing merge conflict

Fixing merge conflict with: https://github.com/Azure/azure-content/pull/1987