diff --git a/src/book_solver.py b/src/book_solver.py
index 41da6c5..b4d4df3 100644
--- a/src/book_solver.py
+++ b/src/book_solver.py
@@ -15,8 +15,11 @@ from abc import abstractmethod, ABCMeta
 
 from livecarta_config import LawCartaConfig
 from util.helpers import BookLogger, BookStatusWrapper
+<<<<<<< HEAD:converter/src/book_solver.py
 
 
+=======
+>>>>>>> develop:converter/src/solver.py
 
 
 class BookSolver:
diff --git a/src/docx_solver.py b/src/docx_solver.py
index 5f3a13d..19e5d18 100644
--- a/src/docx_solver.py
+++ b/src/docx_solver.py
@@ -8,7 +8,11 @@ from threading import Event
 from bs4 import BeautifulSoup
 from html_docx_preprocessor import HTMLDocxPreprocessor
 from libra_html2json_converter import LibraHTML2JSONConverter
+<<<<<<< HEAD
 from book_solver import BookSolver
+=======
+from solver import BookSolver
+>>>>>>> develop
 
 
 class DocxBook(BookSolver):
diff --git a/src/epub_solver.py b/src/epub_solver.py
index 99ce0e2..f03be13 100644
--- a/src/epub_solver.py
+++ b/src/epub_solver.py
@@ -1,5 +1,9 @@
 from epub_converter import EpubConverter
+<<<<<<< HEAD
 from book_solver import BookSolver
+=======
+from solver import BookSolver
+>>>>>>> develop
 
 
 class EpubBook(BookSolver):