diff --git a/examples/diagnostics_and_criticism/Bayes_factor.ipynb b/examples/diagnostics_and_criticism/Bayes_factor.ipynb
index f10066689..f11757b4a 100644
--- a/examples/diagnostics_and_criticism/Bayes_factor.ipynb
+++ b/examples/diagnostics_and_criticism/Bayes_factor.ipynb
@@ -1107,9 +1107,14 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
+<<<<<<< HEAD
+    "* Authored by Osvaldo Martin ([pymc#xxxx](https://github.com/pymc-devs/pymc/pull/ ))\n",
+    "* Updated by Osvaldo Martin in May, 2022 ([pymc#xxxx](https://github.com/pymc-devs/pymc/pull/ ))"
+=======
     "* Authored by Osvaldo Martin in September, 2017 ([pymc#2563](https://github.com/pymc-devs/pymc/pull/2563))\n",
     "* Updated by Osvaldo Martin in August, 2018 ([pymc#3124](https://github.com/pymc-devs/pymc/pull/3124))\n",
     "* Updated by Osvaldo Martin in May, 2022 ([pymc-examples#342](https://github.com/pymc-devs/pymc-examples/pull/342))"
+>>>>>>> 49751c4d45d1c69448169d9adba701e000d7ee7a
    ]
   },
   {
diff --git a/myst_nbs/diagnostics_and_criticism/Bayes_factor.myst.md b/myst_nbs/diagnostics_and_criticism/Bayes_factor.myst.md
index fd2e33304..43a21c373 100644
--- a/myst_nbs/diagnostics_and_criticism/Bayes_factor.myst.md
+++ b/myst_nbs/diagnostics_and_criticism/Bayes_factor.myst.md
@@ -283,9 +283,14 @@ In this example the observed data $y$ is more consistent with `model_1` (because
 
 +++
 
+<<<<<<< HEAD
+* Authored by Osvaldo Martin ([pymc#xxxx](https://github.com/pymc-devs/pymc/pull/ ))
+* Updated by Osvaldo Martin in May, 2022 ([pymc#xxxx](https://github.com/pymc-devs/pymc/pull/ ))
+=======
 * Authored by Osvaldo Martin in September, 2017 ([pymc#2563](https://github.com/pymc-devs/pymc/pull/2563))
 * Updated by Osvaldo Martin in August, 2018 ([pymc#3124](https://github.com/pymc-devs/pymc/pull/3124))
 * Updated by Osvaldo Martin in May, 2022 ([pymc-examples#342](https://github.com/pymc-devs/pymc-examples/pull/342))
+>>>>>>> 49751c4d45d1c69448169d9adba701e000d7ee7a
 
 +++