GONRG-4665: resolved conflicts

2 jobs for !182 with gcp-cicd-anthos in 7 minutes and 2 seconds (queued for 8 seconds)
latest merge request