Fix prow head template merge error

Author: davidz627

deploy/kubernetes/overlays/prow-head-template/node_images.yaml

@@ -9,8 +9,4 @@ spec:
         - name: gce-pd-driver
           image: PROW_GCEPD_IMAGE:latest
         - name: csi-driver-registrar
-<<<<<<< HEAD
           image: gcr.io/gke-release/csi-driver-registrar:v1.0.1-gke.0
-=======
-          image: gcr.io/gke-release/csi-driver-registrar:v1.0.0-gke.0
->>>>>>> bc90fab... Update Prow Head Template