resolves conflict

Author: natasha-moore-elastic

docs/whats-new.asciidoc

@@ -24,9 +24,6 @@ Other versions: {security-guide-all}/8.15/whats-new.html[8.15] | {security-guide
 {security-guide}/attack-discovery.html[Attack Discovery] can now analyze up to 500 alerts at once, and provides higher-quality responses.
 
 [role="screenshot"]
-<<<<<<< HEAD
-image::whats-new/images/8.15/auto-import-success-message.png[The Automatic Import success message, 80%]
-=======
 image::whats-new/images/8.16/attck-disc-alerts-number-menu.png[Attack Discovery alert settings,60%]
 
 [float]
@@ -36,7 +33,6 @@ Elastic AI Assistant's new {security-guide}/ai-assistant-knowledge-base.html[Kno
 
 [role="screenshot"]
 image::whats-new/images/8.16/knowledge-base-add-index-config.png[Knowledge Base's Edit index entry menu,80%]
->>>>>>> 411ac24b (What's new in 8.16 (#6077))
 
 [float]
 == Entity Analytics enhancements