diff --git a/clctm.py b/clctm.py
index eb8e79c..7af85a6 100644
--- a/clctm.py
+++ b/clctm.py
@@ -593,7 +593,11 @@ def create_neighbor_list():
             
             for w in range(len(corpus.input_ids)):
                 
+<<<<<<< HEAD
                 #profprint(f"\n# word {w}")
+=======
+                profprint(f"\n# word {w}")
+>>>>>>> ecbe877c62a0604f42c2f4c4da267e83f45870b1
 
                 doc = corpus.doc_ids[w]
                 z = self.topics[w]