Sg conflict resolved

Merged Somnath Ghorpade requested to merge SG_ConflictResolved into staging

There are currently no pipelines.

To run a merge request pipeline, the jobs in the CI/CD configuration file must be configured to run in merge request pipelines.