diff --git a/requirements/base.in b/requirements/base.in
index 34e1e7c0b5..e1c23e9890 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -35,7 +35,9 @@ django-view-breadcrumbs
 markdown
 django_better_admin_arrayfield
 humanfriendly
+# mail-editor
 git+https://github.com/maykinmedia/mail-editor.git@0.3.5#egg=mail-editor
+fontawesomefree
 django-timeline-logger
 django-csp
 django-csp-reports
diff --git a/requirements/base.txt b/requirements/base.txt
index 563f24aeda..6a9c1ec6d3 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -354,7 +354,11 @@ lxml==4.9.1
     #   maykin-python3-saml
     #   svglib
     #   xmlsec
+<<<<<<< HEAD
 mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@0.3.5
+=======
+mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@66293245ca4b4ea9f05e396a144d6f9a7aedf3b1
+>>>>>>> 83677aa4 ([#939] Update mail-editor)
     # via -r requirements/base.in
 mail-parser==3.15.0
     # via django-yubin
diff --git a/requirements/ci.txt b/requirements/ci.txt
index 4794c402cf..cf30cf2f6d 100644
--- a/requirements/ci.txt
+++ b/requirements/ci.txt
@@ -616,7 +616,11 @@ lxml==4.9.1
     #   pyquery
     #   svglib
     #   xmlsec
+<<<<<<< HEAD
 mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@0.3.5
+=======
+mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@66293245ca4b4ea9f05e396a144d6f9a7aedf3b1
+>>>>>>> 83677aa4 ([#939] Update mail-editor)
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
diff --git a/requirements/dev.txt b/requirements/dev.txt
index c8885c04e9..36628043b3 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -712,7 +712,11 @@ lxml==4.9.1
     #   pyquery
     #   svglib
     #   xmlsec
+<<<<<<< HEAD
 mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@0.3.5
+=======
+mail-editor @ git+https://github.com/maykinmedia/mail-editor.git@66293245ca4b4ea9f05e396a144d6f9a7aedf3b1
+>>>>>>> 83677aa4 ([#939] Update mail-editor)
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt