diff --git a/tools/gce_setup/grpc_docker.sh b/tools/gce_setup/grpc_docker.sh
index 53a00b550a4..a97cc88aee8 100755
--- a/tools/gce_setup/grpc_docker.sh
+++ b/tools/gce_setup/grpc_docker.sh
@@ -943,7 +943,6 @@ grpc_cloud_prod_gen_cxx_cmd() {
     echo $the_cmd
 }
 
-<<<<<<< HEAD
 # constructs the full dockerized cpp interop test cmd.
 #
 #