diff --git a/VAE/01-VAE-with-MNIST.ipynb b/VAE/01-VAE-with-MNIST.ipynb
index 84971087126e145efd9773276d61ecf13fe9883f..5ab28415b9fb75ca3f5c848ec5a159f02fae0b1d 100644
--- a/VAE/01-VAE-with-MNIST.ipynb
+++ b/VAE/01-VAE-with-MNIST.ipynb
@@ -100,11 +100,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": 9,
-=======
-   "execution_count": 3,
->>>>>>> 5a8151ea9b499ba82154af3e8fdc6bc784d75751
    "metadata": {},
    "outputs": [
     {
@@ -113,7 +109,6 @@
      "text": [
       "Model initialized.\n",
       "Outputs will be in  : ./run/MNIST.001\n",
-<<<<<<< HEAD
       "\n",
       " ---------- Encoder -------------------------------------------------- \n",
       "\n",
@@ -169,8 +164,6 @@
       "Trainable params: 102,017\n",
       "Non-trainable params: 0\n",
       "_________________________________________________________________\n",
-=======
->>>>>>> 5a8151ea9b499ba82154af3e8fdc6bc784d75751
       "Config saved in     : ./run/MNIST.001/models/vae_config.json\n"
      ]
     }
@@ -212,11 +205,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": 5,
-=======
-   "execution_count": 4,
->>>>>>> 5a8151ea9b499ba82154af3e8fdc6bc784d75751
    "metadata": {},
    "outputs": [
     {
@@ -242,11 +231,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": 6,
-=======
-   "execution_count": 5,
->>>>>>> 5a8151ea9b499ba82154af3e8fdc6bc784d75751
    "metadata": {},
    "outputs": [],
    "source": [
@@ -267,7 +252,6 @@
      "text": [
       "Train on 60000 samples, validate on 10000 samples\n",
       "Epoch 1/100\n",
-<<<<<<< HEAD
       "  100/60000 [..............................] - ETA: 1:16:33 - loss: 231.5715 - vae_r_loss: 231.5706 - vae_kl_loss: 8.8929e-04WARNING:tensorflow:Method (on_train_batch_end) is slow compared to the batch update (0.261125). Check your callbacks.\n",
       "60000/60000 [==============================] - 16s 259us/sample - loss: 63.3479 - vae_r_loss: 60.5303 - vae_kl_loss: 2.8176 - val_loss: 52.8295 - val_vae_r_loss: 49.3652 - val_vae_kl_loss: 3.4643\n",
       "Epoch 2/100\n",
@@ -470,9 +454,6 @@
       "60000/60000 [==============================] - 8s 126us/sample - loss: 41.8338 - vae_r_loss: 35.9009 - vae_kl_loss: 5.9329 - val_loss: 43.6792 - val_vae_r_loss: 37.6395 - val_vae_kl_loss: 6.0397\n",
       "\n",
       "Train duration : 750.18 sec. - 0:12:30\n"
-=======
-      "14000/60000 [======>.......................] - ETA: 36s - loss: 84.9552 - vae_r_loss: 83.5373 - vae_kl_loss: 1.4178"
->>>>>>> 5a8151ea9b499ba82154af3e8fdc6bc784d75751
      ]
     }
    ],