diff --git a/doc/.wordlist.txt b/doc/.wordlist.txt
index 828beee9..958f93e1 100644
--- a/doc/.wordlist.txt
+++ b/doc/.wordlist.txt
@@ -25,7 +25,10 @@ VM
 YAML
 addons
 balancer
+<<<<<<< HEAD
 boolean
+=======
+>>>>>>> 1c4f2e4e (Fix spelling mistakes to pass spellcheck.)
 dropdown
 favicon
 installable