diff --git a/docs/events/timeline-ui-overview.asciidoc b/docs/events/timeline-ui-overview.asciidoc
index c57c8c15f8..4ed53c2374 100644
--- a/docs/events/timeline-ui-overview.asciidoc
+++ b/docs/events/timeline-ui-overview.asciidoc
@@ -12,9 +12,15 @@ by clicking *+ Add field*.
 [role="screenshot"]
 image::images/timeline-ui-updated.png[example Timeline with several events]
 
+<<<<<<< HEAD
 Timelines are responsive, and they persist as you move through the {security-app}
 collecting data. Auto-saving ensures that the results of your investigation are
 available for later review. To record and share your findings with others, attach your Timeline to a <<cases-overview, case>>.
+=======
+To avoid losing your changes, you must save the Timeline before moving to a different {security-app} page.
+
+If you change an existing Timeline, you can use the **Save as new timeline** toggle to make a new copy of the Timeline, without overwriting the original one.
+>>>>>>> 7122ae66 (Save timeline as new (#4437))
 
 TIP: Untitled Timelines are saved as drafts. To attach a Timeline to a
 <<cases-overview, case>>, you must give it a title.