diff --git a/latex/main.tex b/latex/main.tex
index 927bf32..e051836 100644
--- a/latex/main.tex
+++ b/latex/main.tex
@@ -21,7 +21,11 @@
 
 \addbibresource{bibliography.bib}
 
+<<<<<<< HEAD
 % \makeglossaries
+=======
+\makeglossaries
+>>>>>>> d743ba4 (feat(latex): add glossary, acronyms, and notations)
 \input{frontmatter/acronym}
 \input{frontmatter/glossaries}
 \input{frontmatter/notations}