chore: resolved conflicts#594

Prajwal-Microsoft merged 13 commits into

devmicrosoft/content-processing-solution-accelerator:devfrom

prdc-conflict-resolvemicrosoft/content-processing-solution-accelerator:prdc-conflict-resolveCopy head branch name to clipboard