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