diff --git a/file/malware/hash/codoso-pgv-malware-hash.yaml b/file/malware/hash/codoso-pgv-malware-hash.yaml
index c6612ab3fd..f346a94739 100644
--- a/file/malware/hash/codoso-pgv-malware-hash.yaml
+++ b/file/malware/hash/codoso-pgv-malware-hash.yaml
@@ -15,20 +15,10 @@ file:
     - all
 
   matchers:
-<<<<<<< HEAD
     - type: dsl
       dsl:
         - "sha256(raw) == '4b16f6e8414d4192d0286b273b254fa1bd633f5d3d07ceebd03dfdfc32d0f17f'"
         - "sha256(raw) == '13bce64b3b5bdfd24dc6f786b5bee08082ea736be6536ef54f9c908fd1d00f75'"
         - "sha256(raw) == 'bc0b885cddf80755c67072c8b5961f7f0adcaeb67a1a5c6b3475614fd51696fe'"
         - "sha256(raw) == '4b16f6e8414d4192d0286b273b254fa1bd633f5d3d07ceebd03dfdfc32d0f17f'"
-      condition: or
-=======
-    type: dsl
-    dsl:
-      - "sha256(raw) == '4b16f6e8414d4192d0286b273b254fa1bd633f5d3d07ceebd03dfdfc32d0f17f'"
-      - "sha256(raw) == '13bce64b3b5bdfd24dc6f786b5bee08082ea736be6536ef54f9c908fd1d00f75'"
-      - "sha256(raw) == 'bc0b885cddf80755c67072c8b5961f7f0adcaeb67a1a5c6b3475614fd51696fe'"
-      - "sha256(raw) == '4b16f6e8414d4192d0286b273b254fa1bd633f5d3d07ceebd03dfdfc32d0f17f'"
-    condition: or
->>>>>>> 687b9c6e63b39e715ed31005f70c97b54fd44c8e
+      condition: or
\ No newline at end of file