diff --git a/cves/2021/CVE-2021-21345.yaml b/cves/2021/CVE-2021-21345.yaml
index 514d3c9e5c..165ffa9e9d 100644
--- a/cves/2021/CVE-2021-21345.yaml
+++ b/cves/2021/CVE-2021-21345.yaml
@@ -87,8 +87,4 @@ requests:
       - type: word
         part: interactsh_request
         words:
-<<<<<<< HEAD:vulnerabilities/xstream/CVE-2021-21345.yaml
-          - "User-Agent: {{rand_base(6)}}"
-=======
-          - "User-Agent: nuclei"
->>>>>>> 75dddfacfcca4495aa24b7d5a7d5188bf61d9640:cves/2021/CVE-2021-21345.yaml
+          - "User-Agent: {{rand_base(6)}}"
\ No newline at end of file
diff --git a/cves/2021/CVE-2021-39144 .yaml b/cves/2021/CVE-2021-39144 .yaml
index da15e01980..134c9ca813 100644
--- a/cves/2021/CVE-2021-39144 .yaml	
+++ b/cves/2021/CVE-2021-39144 .yaml	
@@ -66,8 +66,5 @@ requests:
       - type: word
         part: interactsh_request
         words:
-<<<<<<< HEAD:vulnerabilities/xstream/CVE-2021-39144 .yaml
           - "User-Agent: {{rand_base(6)}}"
-=======
-          - "User-Agent: nuclei"
->>>>>>> 75dddfacfcca4495aa24b7d5a7d5188bf61d9640:cves/2021/CVE-2021-39144 .yaml
+