Update .github/workflows/serverless-project.yml

Author: v1v

.github/workflows/serverless-project.yml

@@ -75,11 +75,7 @@ jobs:
           project-id: "elastic-observability-ci"
 
       - name: Set up Cloud SDK
-<<<<<<< HEAD
-        uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a
-=======
         uses: google-github-actions/setup-gcloud@26f734c2779b00b7dda794207734c511110a4368
->>>>>>> abfe4dae2 (build(deps): bump google-github-actions/setup-gcloud from 2.2.0 to 3.0.0 (#9587))
 
       # TODO: as soon as the oblt-framework supports elastic-observability-ci we can avoid this step.
       # NOTE: