diff --git a/codespell_lib/data/dictionary.txt b/codespell_lib/data/dictionary.txt
index 3635a87f569..080bc630cbf 100644
--- a/codespell_lib/data/dictionary.txt
+++ b/codespell_lib/data/dictionary.txt
@@ -5,6 +5,9 @@
 3rt->3rd
 3st->3rd
 4rd->4th
+<<<<<<< HEAD
+=======
+>>>>>>> 5567a30885 (Additional en-GB → en-US entries)
 __attribyte__->__attribute__
 __cpluspus->__cplusplus
 __cpusplus->__cplusplus
@@ -24554,20 +24557,16 @@ exntry->entry
 exolicit->explicit
 exolicitly->explicitly
 exonorate->exonerate
-<<<<<<< HEAD
-exort->export, extort, exert, exhort,
-exorted->exported, extorted, exerted, exhorted,
-exorting->exporting, extorting, exerting, exhorting,
-exorts->exports, extorts, exerts, exhorts,
-||||||| parent of 5567a30885 (Additional en-GB → en-US entries)
-exort->export, exhort,
-exorted->exported, extorted, exerted,
-=======
 exorcizer->exorcist
 exorcizers->exorcists
 exort->export, exhort,
+exort->export, exhort,
+exort->export, extort, exert, exhort,
 exorted->exported, extorted, exerted,
->>>>>>> 5567a30885 (Additional en-GB → en-US entries)
+exorted->exported, extorted, exerted,
+exorted->exported, extorted, exerted, exhorted,
+exorting->exporting, extorting, exerting, exhorting,
+exorts->exports, extorts, exerts, exhorts,
 exoskelaton->exoskeleton
 expad->expand, expat,
 expaded->expanded
@@ -61397,6 +61396,7 @@ zukeeni->zucchini
 zuser->user
 zylophone->xylophone
 zylophones->xylophones
+||||||| parent of 5567a30885 (Additional en-GB → en-US entries)
 évaluate->evaluate
 сontain->contain
 сontained->contained