solving conflicts between github and gitlab versions

Author: VirtualEmbryo

README.md

@@ -174,8 +174,7 @@ If you use this work, please cite:
 
 ```bibtex
 @misc{pasqui2025selfsupervisedzsliceaugmentation3d,
-      title={Self-Supervised Z-Slice Augmentation for 3D Bio-Imaging via Knowledge Distillation}, 
-      author={Alessandro Pasqui and Sajjad Mahdavi and Benoit Vianay and Alexandra Colin and Alex McDougall and Rémi Dumollard and Yekaterina A. Miroshnikova and Elsa Labrune and Hervé Turlier},
+      title={Self-Supervised Z-Slice Augmentation for 3D Bio-Imaging via Knowledge Distillation}, author={Alessandro Pasqui and Sajjad Mahdavi and Benoit Vianay and Alexandra Colin and Alex McDougall and Rémi Dumollard and Yekaterina A. Miroshnikova and Elsa Labrune and Hervé Turlier},
       year={2025},
       eprint={2503.04843},
       archivePrefix={arXiv},

zaugnet_colab.ipynb

@@ -88,6 +88,7 @@
       "outputs": [],
       "source": [
         "!git clone https://github.com/VirtualEmbryo/ZAugNet.git"
+<<<<<<< HEAD
       ]
     },
     {
@@ -121,8 +122,43 @@
         "!mv /content/ZAugNet/zaugnet_data_and_models/zenodo/humans /content/ZAugNet/data/humans\n",
         "!mv /content/ZAugNet/zaugnet_data_and_models/zenodo/nuclei /content/ZAugNet/data/nuclei\n",
         "!mv /content/ZAugNet/zaugnet_data_and_models/zenodo/results /content/ZAugNet/results"
+=======
+>>>>>>> 24dd0f40c0f345e5b34afd3b910460dc071e1e15
       ]
     },
+    {
+      "cell_type": "markdown",
+      "source": [
+        "* **(Optional)** Download train/test data images and pre-trained models:"
+      ],
+      "metadata": {
+        "id": "WdKYdfzX2nge"
+      }
+    },
+    {
+      "cell_type": "code",
+      "source": [
+        "# Download data and pre-trained models from Zenodo\n",
+        "!curl \"https://zenodo.org/records/14961732/files/zenodo.zip?download=1\" --output /content/ZAugNet/zaugnet_data_and_models.zip\n",
+        "\n",
+        "# Unzip the folder\n",
+        "import shutil\n",
+        "shutil.unpack_archive(\"/content/ZAugNet/zaugnet_data_and_models.zip\", \"/content/ZAugNet/zaugnet_data_and_models\")\n",
+        "\n",
+        "# Create data folder and move files\n",
+        "!mkdir /content/ZAugNet/data\n",
+        "!mv /content/ZAugNet/zaugnet_data_and_models/zenodo/ascidians /content/ZAugNet/data/ascidians\n",
+        "!mv /content/ZAugNet/zaugnet_data_and_models/zenodo/filaments /content/ZAugNet/data/filaments\n",
+        "!mv /content/ZAugNet/zaugnet_data_and_models/zenodo/humans /content/ZAugNet/data/humans\n",
+        "!mv /content/ZAugNet/zaugnet_data_and_models/zenodo/nuclei /content/ZAugNet/data/nuclei\n",
+        "!mv /content/ZAugNet/zaugnet_data_and_models/zenodo/results /content/ZAugNet/results"
+      ],
+      "metadata": {
+        "id": "osmjfhvc23lq"
+      },
+      "execution_count": null,
+      "outputs": []
+    },
     {
       "cell_type": "markdown",
       "metadata": {
@@ -420,4 +456,4 @@
   },
   "nbformat": 4,
   "nbformat_minor": 0
-}
+}