[admin] merge to live

[lindalu-MSFT]

Resolve merge conflicts

[learn-build-service-prod]

Learn Build status updates of commit f3ed347:

❌ Validation status: errors

Please follow instructions here which may help to resolve issue.

File	Status	Preview URL	Details
	❌Error		Details

• [Error: CannotMergeCommit] Cannot merge commit f3ed3478e024e66a3822f19a8f2f9f613c986f07 in branch main of repository https://github.com/OfficeDev/open-xml-docs into branch live (commit 638c8fbc456bdd7c953390aac191bbfa476b7c3d). Please follow this documentation: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ to use git.exe to resolve you content conflicts locally and then push to remote.

For more details, please refer to the build report.

Note: Your PR may contain errors or warnings or suggestions unrelated to the files you changed. This happens when external dependencies like GitHub alias, Microsoft alias, cross repo links are updated. Please use these instructions to resolve them.

For any questions, please:

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

[learn-build-service-prod]

Learn Build status updates of commit 11f69a1:

✅ Validation status: passed

File	Status	Preview URL	Details
docs/presentation/how-to-add-a-video-to-a-slide-in-a-presentation.md	✅Succeeded
docs/presentation/how-to-add-transitions-between-slides-in-a-presentation.md	✅Succeeded
docs/presentation/how-to-delete-all-the-comments-by-an-author-from-all-the-slides-in-a-presentatio.md	✅Succeeded	n/a (file deleted or renamed)
docs/presentation/how-to-delete-all-the-comments-by-an-author-from-all-the-slides-in-a-presentation.md	✅Succeeded
docs/presentation/overview.md	✅Succeeded
docs/presentation/working-with-comments.md	✅Succeeded
docs/spreadsheet/overview.md	✅Succeeded
docs/toc.yml	✅Succeeded
docs/word/overview.md	✅Succeeded
samples/presentation/add_transition/cs/add_transition_cs.csproj	✅Succeeded
samples/presentation/add_transition/cs/Program.cs	✅Succeeded
samples/presentation/add_transition/vb/add_transition_vb.vbproj	✅Succeeded
samples/presentation/add_transition/vb/Program.vb	✅Succeeded
samples/presentation/add_video/cs/add_video_cs.csproj	✅Succeeded
samples/presentation/add_video/cs/Program.cs	✅Succeeded
samples/presentation/add_video/vb/add_video_vb.vbproj	✅Succeeded
samples/presentation/add_video/vb/Program.vb	✅Succeeded
samples/README.md	✅Succeeded
samples/samples.sln	✅Succeeded

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