resolved go mod conflict

Merged Somnath Ghorpade requested to merge SG_Conflict_new into devbranch

Merge request reports