Resolve merge conflicts in main - Pull/716

[nguyen-dows]

Resolve merge conflicts

[learn-build-service-prod[bot]]

Learn Build status updates of commit 8f79cc6:

:white_check_mark: Validation status: passed

For more details, please refer to the build report.

For any questions, please:

• Try searching the learn.microsoft.com contributor guides
• Post your question in the Learn support channel