diff --git a/v3/integration/small.config.json b/v3/integration/small.config.json
index 73785fd40..621242602 100644
--- a/v3/integration/small.config.json
+++ b/v3/integration/small.config.json
@@ -430,12 +430,9 @@
     "w_tls_server_cert_valid_time_longer_than_397_days": {},
     "w_rfc_dnsname_underscore_in_trd": {
       "WarnCount": 13
-<<<<<<< HEAD
-=======
     },
     "w_sub_cert_aia_contains_internal_names": {
       "WarnCount": 7
->>>>>>> 45de88040a22e2db4d962de9ec3847dcac59be92
     }
   }
 }
\ No newline at end of file