fixed conflicts

Author: noydavidi

Packs/AggregatedScripts/ReleaseNotes/1_0_12.md

@@ -1,6 +1 @@
-
-#### Scripts
-
-##### get-endpoint-data
-- Added the *using-brand* argument in the ***endpoint*** command. The script now runs from the default list of brands in the documentation and brands not from the list with ***endpoint*** command.
-- Fixed an issue where the script returned duplicate results for brands that contain the ***endpoint*** command.
+Documentation and metadata improvements.

Packs/AggregatedScripts/ReleaseNotes/1_0_13.md

@@ -0,0 +1,6 @@
+
+#### Scripts
+
+##### get-endpoint-data
+- Added the *using-brand* argument in the ***endpoint*** command. The script now runs from the default list of brands in the documentation and brands not from the list with ***endpoint*** command.
+- Fixed an issue where the script returned duplicate results for brands that contain the ***endpoint*** command.

Packs/AggregatedScripts/pack_metadata.json

@@ -2,7 +2,7 @@
     "name": "Aggregated Scripts",
     "description": "A pack containing all aggregated scripts.",
     "support": "xsoar",
-    "currentVersion": "1.0.12",
+    "currentVersion": "1.0.13",
     "author": "Cortex XSOAR",
     "url": "https://www.paloaltonetworks.com/cortex",
     "email": "",