diff --git a/module2/exo1/toy_notebook_fr.ipynb b/module2/exo1/toy_notebook_fr.ipynb
index 1a8110e219bf36d53cd4c1ad41b79106f5e31870..bb1370b098f94599df9f4ee2055e53c9d1a842ed 100644
--- a/module2/exo1/toy_notebook_fr.ipynb
+++ b/module2/exo1/toy_notebook_fr.ipynb
@@ -6,7 +6,11 @@
    "source": [
     "\n",
     "\n",
+<<<<<<< HEAD
     "# À propos du calcul de π\n",
+=======
+    "# À propos du calcul de π$
+>>>>>>> 251fc4b22e66f7e8b4dd7d426701214882c31a80
     "\n",
     "##  En demandant à la lib maths\n",
     "\n",
diff --git a/module3/exo1/analyse-syndrome-grippal.ipynb b/module3/exo1/analyse-syndrome-grippal.ipynb
index 4933e016e5d0241312815f3bee24f6b3e7bfad67..2e3e50b169e34c40d42a73efcd70c013ce58f7cd 100644
--- a/module3/exo1/analyse-syndrome-grippal.ipynb
+++ b/module3/exo1/analyse-syndrome-grippal.ipynb
@@ -61,9 +61,21 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 1,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "ename": "NameError",
+     "evalue": "name 'pd' is not defined",
+     "output_type": "error",
+     "traceback": [
+      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
+      "\u001b[0;31mNameError\u001b[0m                                 Traceback (most recent call last)",
+      "\u001b[0;32m<ipython-input-1-c6940997bed1>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0mraw_data\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mpd\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mread_csv\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mdata_url\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mskiprows\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;36m1\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m      2\u001b[0m \u001b[0mraw_data\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
+      "\u001b[0;31mNameError\u001b[0m: name 'pd' is not defined"
+     ]
+    }
+   ],
    "source": [
     "raw_data = pd.read_csv(data_url, skiprows=1)\n",
     "raw_data"