Resolve merge conflict

Author: pyth0n1c

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "contentctl"]
-	path = contentctl
-	url = https://github.com/splunk/contentctl.git
-        ignore = all

contentctl

@@ -1,17 +1,11 @@
-#############
-# Automatically generated by generator.py in splunk/security_content
-# On Date: 2023-10-24T00:38:29 UTC
-# Author: Splunk Threat Research Team - Splunk
-# Contact: [email protected]
-#############
 {
   "schemaVersion": "1.0.0", 
   "info": {
-    "title": "ContentPack", 
+    "title": "DA-ESS-ContentUpdate", 
     "id": {
       "group": null, 
       "name": "DA-ESS-ContentUpdate", 
-      "version": "4.14.0"
+      "version": "4.15.0"
     }, 
     "author": [
       {

dist/DA-ESS-ContentUpdate/app.manifest

@@ -1,6 +1,6 @@
 #############
 # Automatically generated by generator.py in splunk/security_content
-# On Date: 2023-10-24T00:38:29 UTC
+# On Date: 2023-11-01T20:44:08 UTC
 # Author: Splunk Threat Research Team - Splunk
 # Contact: [email protected]
 #############
@@ -10,7 +10,7 @@
 is_configured = false
 state = enabled
 state_change_requires_restart = false
-build = 20231024003559
+build = 20231101204321
 
 [triggers]
 reload.analytic_stories = simple
@@ -26,12 +26,12 @@ reload.es_investigations = simple
 
 [launcher]
 author = Splunk
-version = 4.14.0 
+version = 4.15.0 
 description = Explore the Analytic Stories included with ES Content Updates.
 
 [ui]
 is_visible = true
-label = ContentPack
+label = DA-ESS-ContentUpdate
 
 [package]
 id = DA-ESS-ContentUpdate

dist/DA-ESS-ContentUpdate/default/analyticstories.conf

@@ -1,6 +1,6 @@
 #############
 # Automatically generated by generator.py in splunk/security_content
-# On Date: 2023-10-24T00:38:29 UTC
+# On Date: 2023-11-01T20:44:08 UTC
 # Author: Splunk Threat Research Team - Splunk
 # Contact: [email protected]
 #############

dist/DA-ESS-ContentUpdate/default/app.conf

@@ -1,8 +1,8 @@
 #############
 # Automatically generated by generator.py in splunk/security_content
-# On Date: 2023-10-24T00:38:29 UTC
+# On Date: 2023-11-01T20:44:08 UTC
 # Author: Splunk Threat Research Team - Splunk
 # Contact: [email protected]
 #############
 [content-version]
-version = 4.14.0 
+version = 4.15.0 

dist/DA-ESS-ContentUpdate/default/collections.conf

@@ -1,6 +1,6 @@
 #############
 # Automatically generated by generator.py in splunk/security_content
-# On Date: 2023-10-24T00:38:29 UTC
+# On Date: 2023-11-01T20:44:08 UTC
 # Author: Splunk Threat Research Team - Splunk
 # Contact: [email protected]
 #############

dist/DA-ESS-ContentUpdate/default/content-version.conf

@@ -1,6 +1,6 @@
 #############
 # Automatically generated by generator.py in splunk/security_content
-# On Date: 2023-10-24T00:38:29 UTC
+# On Date: 2023-11-01T20:44:08 UTC
 # Author: Splunk Threat Research Team - Splunk
 # Contact: [email protected]
 #############
@@ -5417,6 +5417,10 @@ description = Update this macro to limit the output results to filter out false
 definition = search *
 description = Update this macro to limit the output results to filter out false positives.
 
+[citrix_adc_and_gateway_unauthorized_data_disclosure_filter]
+definition = search *
+description = Update this macro to limit the output results to filter out false positives.
+
 [citrix_adc_exploitation_cve_2023_3519_filter]
 definition = search *
 description = Update this macro to limit the output results to filter out false positives.
@@ -5457,6 +5461,10 @@ description = Update this macro to limit the output results to filter out false
 definition = search *
 description = Update this macro to limit the output results to filter out false positives.
 
+[f5_tmui_authentication_bypass_filter]
+definition = search *
+description = Update this macro to limit the output results to filter out false positives.
+
 [fortinet_appliance_auth_bypass_filter]
 definition = search *
 description = Update this macro to limit the output results to filter out false positives.