diff --git a/simpegPF/notebooks/Play_analytic_fun.ipynb b/simpegPF/notebooks/Play_analytic_fun.ipynb
index 90321e3a..feca0e69 100644
--- a/simpegPF/notebooks/Play_analytic_fun.ipynb
+++ b/simpegPF/notebooks/Play_analytic_fun.ipynb
@@ -183,6 +183,9 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
       "import simpegPF as PF"
      ],
      "language": "python",
@@ -195,6 +198,15 @@
      "collapsed": false,
      "input": [
       "PF.Magnetics.MagneticsDiffSecondary"
+=======
+      "bx.size"
+>>>>>>> Stashed changes
+=======
+      "bx.size"
+>>>>>>> Stashed changes
+=======
+      "bx.size"
+>>>>>>> Stashed changes
      ],
      "language": "python",
      "metadata": {},
@@ -202,6 +214,9 @@
       {
        "metadata": {},
        "output_type": "pyout",
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
        "prompt_number": 14,
        "text": [
         "simpegPF.Magnetics.MagneticsDiffSecondary"
@@ -287,6 +302,25 @@
       }
      ],
      "prompt_number": 10
+=======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+       "prompt_number": 7,
+       "text": [
+        "524880"
+       ]
+      }
+     ],
+     "prompt_number": 7
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
     },
     {
      "cell_type": "code",