fix: broken merge (#8828)

Author: plumpy

deploy/skaffold/Dockerfile.deps.lts

@@ -101,9 +101,5 @@ RUN apt-get update && apt-get install --no-install-recommends --no-install-sugge
     jq \
     apt-transport-https && \
     rm -rf /var/lib/apt/lists/*
-<<<<<<< HEAD
-COPY --from=golang:1.19.6 /usr/local/go /usr/local/go
-=======
 COPY --from=golang:1.19.9 /usr/local/go /usr/local/go
->>>>>>> 140f4ff75 (chore: update various container deps. (#8810))
 ENV PATH /usr/local/go/bin:/root/go/bin:$PATH