diff --git a/docs/notebooks/definition.ipynb b/docs/notebooks/definition.ipynb
index 17abc7a..44e474c 100644
--- a/docs/notebooks/definition.ipynb
+++ b/docs/notebooks/definition.ipynb
@@ -269,7 +269,6 @@
    "outputs": [],
    "source": [
     "from graphviz import Digraph\n",
-    "import dot2tex\n",
     "\n",
     "\n",
     "dot = Digraph()\n",
diff --git a/docs/notebooks/solution.ipynb b/docs/notebooks/solution.ipynb
index f058705..02d46ce 100644
--- a/docs/notebooks/solution.ipynb
+++ b/docs/notebooks/solution.ipynb
@@ -23,7 +23,6 @@
    "outputs": [],
    "source": [
     "from graphviz import Digraph\n",
-    "import dot2tex\n",
     "\n",
     "\n",
     "dot = Digraph()\n",
diff --git a/src/pygom/model/base_ode_model.py b/src/pygom/model/base_ode_model.py
index afd04e1..5fd6994 100644
--- a/src/pygom/model/base_ode_model.py
+++ b/src/pygom/model/base_ode_model.py
@@ -165,7 +165,10 @@ def parameters(self):
         """
         if not hasattr(self, "_parameters"):
             return None
+<<<<<<< HEAD
 
+=======
+>>>>>>> 8392bdc583652db66b54b5e7b7ccd4868a6607c4
         return self._parameters
 
     @parameters.setter
@@ -1503,4 +1506,4 @@ def _extractUpperTriangle(self, A, nrow=None, ncol=None):
             for j in range(i, ncol):
                 B[i,j] = A[i, j]
 
-        return B
\ No newline at end of file
+        return B