resolve merge conflict

clusters/threat-actor.json

@@ -3759,13 +3759,13 @@
     },
     {
       "value": "The Big Bang",
-      "uuid": "475df014-556a-41db-ad6a-ff509dd202a1",
       "description": "While it is not clear exactly what the attacker is looking for, what is clear is that once he finds it, a second stage of the attack awaits, fetching additional modules and/or malware from the Command and Control server. This then is a surveillance attack in progress and has been dubbed ‘Big Bang’ due to the attacker’s fondness for the ‘Big Bang Theory’ TV show, after which some of the malware’s modules are named.",
       "meta": {
         "refs": [
           "https://research.checkpoint.com/apt-attack-middle-east-big-bang/",
           "https://blog.talosintelligence.com/2017/06/palestine-delphi.html"
         ]
+<<<<<<< HEAD
       }
     },
     {
@@ -3797,7 +3797,6 @@
           "https://researchcenter.paloaltonetworks.com/2018/07/unit42-new-threat-actor-group-darkhydrus-targets-middle-east-government/"
         ]
       }
->>>>>>> 38f559a3ff4fbb46ca8b1a9163ad72f2c12ca1ed
     }
   ],
   "name": "Threat actor",
@@ -3812,9 +3811,5 @@
   ],
   "description": "Known or estimated adversary groups targeting organizations and employees. Adversary groups are regularly confused with their initial operation or campaign.",
   "uuid": "7cdff317-a673-4474-84ec-4f1754947823",
-<<<<<<< HEAD
-  "version": 47
-=======
   "version": 49
->>>>>>> 38f559a3ff4fbb46ca8b1a9163ad72f2c12ca1ed
 }

clusters/tool.json

@@ -2,7 +2,7 @@
   "uuid": "0d821b68-9d82-4c6d-86a6-1071a9e0f79f",
   "description": "threat-actor-tools is an enumeration of tools used by adversaries. The list includes malware but also common software regularly used by the adversaries.",
   "source": "MISP Project",
-  "version": 80,
+  "version": 81,
   "values": [
     {
       "meta": {