diff --git a/core/corehttp/hostname_test.go b/core/corehttp/hostname_test.go
index 9c181702db1..cf00e827121 100644
--- a/core/corehttp/hostname_test.go
+++ b/core/corehttp/hostname_test.go
@@ -180,9 +180,5 @@ func TestKnownSubdomainDetails(t *testing.T) {
 }
 
 func equalError(a, b error) bool {
-<<<<<<< HEAD
 	return (a == nil && b == nil) || (a != nil && b != nil && a.Error() == b.Error())
-=======
-	return a == nil && b == nil || a != nil && b != nil && a.Error() == b.Error()
->>>>>>> feat: support ED25519 at subdomain gw with TLS
 }