diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi
index 6706ee19..75638f8f 100644
--- a/mu4e/mu4e.texi
+++ b/mu4e/mu4e.texi
@@ -1622,13 +1622,29 @@ Other MIME-parts in the messages include @emph{attachments}.
 @cindex attachments
 
 Many e-mail messages contain @emph{attachments}, which are MIME-parts that
+<<<<<<< HEAD
 encode files which you can extract.
+||||||| parent of 35b9b725 (mu4e: update docs for mu4e-view-save-attachments)
+Many e-mail messages also contain @emph{attachments}, which are MIME-parts that
+contain files@footnote{Attachments come in two flavors: @t{inline} and
+@t{attachment}. @code{mu4e} does not distinguish between the two when operating on
+them: everything that specifies a filename is considered an attachment}.
+=======
+encode files@footnote{Attachments come in two flavors: @t{inline} and
+@t{attachment}. @code{mu4e} does not distinguish between the two when operating on
+them: everything that specifies a filename is considered an attachment}.
+>>>>>>> 35b9b725 (mu4e: update docs for mu4e-view-save-attachments)
 
+<<<<<<< HEAD
 @footnote{@code{mu} uses some heuristics to decide if a part should be treated
 as an attachment; including @t{inline} parts that specify a filename. The
 heuristic tries to balance false-positive and false-negatives, both of which are
 possible}
 
+||||||| parent of 35b9b725 (mu4e: update docs for mu4e-view-save-attachments)
+To save such attachments as files on your computer, @code{mu4e}'s message-view
+=======
+>>>>>>> 35b9b725 (mu4e: update docs for mu4e-view-save-attachments)
 To save attachments as files on your computer, @code{mu4e}'s message-view
 offers the command @code{mu4e-view-save-attachments}; its default keybinding is
 @key{e} (think @emph{extract}).