methodComparison notebook is not merged properly, so can't be read

[VPetukhov]

Thank you for publishing the analysis! After the last commit, methodComparison-mousebrain.ipynb has unmerged changes like below. So it can't be open.

   "metadata": {},
<<<<<<< HEAD
   "outputs": [],
=======
   "outputs": [
    {
     "name": "stderr",
     "output_type": "stream",
     "text": [
      "/Users/naghipourfar/PycharmProjects/trVAE_reproducibility/venv/lib/python3.7/site-packages/statsmodels/tools/_testing.py:19: FutureWarning: pandas.util.testing is deprecated. Use the functions in the public API at pandas.testing instead.\n",
      "  import pandas.util.testing as tm\n"
     ]
    }
   ],
>>>>>>> 2c96063841d4832157f32e3a2a4652d401d00772