diff --git a/tools/gce_setup/grpc_docker.sh b/tools/gce_setup/grpc_docker.sh
index e0d2683827c8e7548e3117869c38812107b14030..53a00b550a4f5b924ddace470ec964db053bb800 100755
--- a/tools/gce_setup/grpc_docker.sh
+++ b/tools/gce_setup/grpc_docker.sh
@@ -974,7 +974,4 @@ grpc_cloud_prod_auth_compute_engine_creds_gen_cxx_cmd() {
     echo $the_cmd
 }
 
-# TODO(grpc-team): add grpc_interop_gen_xxx_cmd for python|cxx|nodejs
-=======
-# TODO(grpc-team): add grpc_interop_gen_python_cmd
->>>>>>> 415bca7939809aa5156c7163defc89712b800cb7
+# TODO(grpc-team): add grpc_interop_gen_xxx_cmd for python|nodejs