diff --git a/.cspell.json b/.cspell.json
index 329cec6..62b8370 100644
--- a/.cspell.json
+++ b/.cspell.json
@@ -76,12 +76,9 @@
     "faucet",
     "concat",
     "certonly",
-<<<<<<< HEAD
     "txid",
-=======
     "baarerstrasse",
     "FDPIC",
->>>>>>> 412a1c8 (fix cspell words (#160))
   ],
   "flagWords": [],
   "ignorePaths": [