diff --git a/zero_to_hero_guide/04_Tool_Calling101.ipynb b/zero_to_hero_guide/04_Tool_Calling101.ipynb
index b69f5dd21..d05c44048 100644
--- a/zero_to_hero_guide/04_Tool_Calling101.ipynb
+++ b/zero_to_hero_guide/04_Tool_Calling101.ipynb
@@ -5,11 +5,7 @@
    "id": "7a1ac883",
    "metadata": {},
    "source": [
-<<<<<<< HEAD:zero_to_hero_guide/04_Tool_Calling101.ipynb
     "## Tool Calling\n",
-=======
-    "<a href=\"https://colab.research.google.com/github/meta-llama/llama-stack/blob/main/docs/04_Tool_Calling101.ipynb\" target=\"_parent\"><img src=\"https://colab.research.google.com/assets/colab-badge.svg\" alt=\"Open In Colab\"/></a>\n",
->>>>>>> a4682b66 (enhanced tool calling guide):docs/zero_to_hero_guide/04_Tool_Calling101.ipynb
     "\n",
     "\n",
     "## Creating a Custom Tool and Agent Tool Calling\n"