diff --git a/HISTORY.rst b/HISTORY.rst
index 3dd33f1412..29ceb7331d 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -80,9 +80,9 @@
   Deploy a Redis container.
 - Improve document version upload form.
 - Use dropzone for document version upload form.
-<<<<<<< HEAD
 - Allow the "Execute document tools" permission to be
   granted via ACL.
+- Update IMAP source to be UID based.
 - Add support for custom IMAP search criteria.
 - Add support for executing custom IMAP STORE commands
   on processed messages.
diff --git a/docs/releases/3.3.rst b/docs/releases/3.3.rst
index 1b6f847934..ddecc16450 100644
--- a/docs/releases/3.3.rst
+++ b/docs/releases/3.3.rst
@@ -89,6 +89,7 @@ Changes
 - Unify all line endings to be Linux style.
 - Add support for changing the system messages position.
   GitLab issue #640. Thanks to Matthias Urhahn (@d4rken).
+- Update IMAP source to be UID based.
 - Add support for custom IMAP search criteria.
 - Add support for executing custom IMAP STORE commands
   on processed messages.