diff --git a/connect/proxy/proxy.go b/connect/proxy/proxy.go
index 8f74168b4a..61cdec5e2d 100644
--- a/connect/proxy/proxy.go
+++ b/connect/proxy/proxy.go
@@ -73,13 +73,8 @@ func (p *Proxy) Serve() error {
 					tcfg := service.ServerTLSConfig()
 					cert, _ := tcfg.GetCertificate(nil)
 					leaf, _ := x509.ParseCertificate(cert.Certificate[0])
-<<<<<<< HEAD
 					p.logger.Printf("[DEBUG] leaf: %s roots: %s", leaf.URIs[0],
 						bytes.Join(tcfg.RootCAs.Subjects(), []byte(",")))
-				}()
-=======
-					p.logger.Printf("[DEBUG] leaf: %s roots: %s", leaf.URIs[0], bytes.Join(tcfg.RootCAs.Subjects(), []byte(",")))
->>>>>>> Make proxy only listen after initial certs are fetched
 
 					// Only start a listener if we have a port set. This allows
 					// the configuration to disable our public listener.