fix: Resolve conflicts in main.json files#748

Open

NirajC-Microsoft wants to merge 9 commits intodevfrom

psl-fixconflict-main

Commits on Oct 29, 2025

Merge pull request #721 from microsoft/dev
Prajwal-Microsoft
authored

Commits on Nov 3, 2025

Merge pull request #730 from microsoft/dev
Prajwal-Microsoft
authored

Commits on Nov 10, 2025

docs: merge from dev to main Samplequestion (#737)

authored

Commits on Nov 17, 2025