diff --git a/reference/users/youwen/config/harper-ls/dictionary.txt b/reference/users/youwen/config/harper-ls/dictionary.txt
index 24bda15..de63ae0 100644
--- a/reference/users/youwen/config/harper-ls/dictionary.txt
+++ b/reference/users/youwen/config/harper-ls/dictionary.txt
@@ -18,9 +18,9 @@ transpiles
 Gradescope
 bijections
 disjunction
-<<<<<<< HEAD
 denumerable
 Multinomial
 biconditional
 hyperextensible
 diagonalization
+parametrization