diff --git a/init.sh b/init.sh
index 18330f6..9d223de 100755
--- a/init.sh
+++ b/init.sh
@@ -36,7 +36,11 @@ export LC_ALL=C
 export LANG=C
 
 # Version of init
+<<<<<<< HEAD
 export VERSION="0.99.7"
+=======
+export VERSION="0.99.6"
+>>>>>>> 8e8a2267286e904fde4e486a171dd141da66fc3a
 
 # Store script's path
 export MYPATH=$(dirname $0)
@@ -126,7 +130,10 @@ for mod in $MODULE_LIST; do
 done
 
 if [[ $RUN_SHELL == true ]]; then
+<<<<<<< HEAD
     prnt I "Lancement d'un shell intéractif..."
+=======
+>>>>>>> 8e8a2267286e904fde4e486a171dd141da66fc3a
     bash --noprofile --rcfile $MYPATH/bash.rc
     prnt I "Sortie du script après exécution du shell."
     exit 0
diff --git a/modules/conf_disks.sh b/modules/conf_disks.sh
index c11f797..c4cd285 100644
--- a/modules/conf_disks.sh
+++ b/modules/conf_disks.sh
@@ -16,7 +16,11 @@
 #  * CALCDRV: Target drives, preferably through ID.
 # ------------------------------------------------------------------------------
 
+<<<<<<< HEAD
 export VER_conf_disks="0.0.9"
+=======
+export VER_conf_disks="0.0.8"
+>>>>>>> 8e8a2267286e904fde4e486a171dd141da66fc3a
 export DEP_conf_disks="upgrade_dist"
 
 # ------------------------------------------------------------------------------
diff --git a/modules/install_chromium.sh b/modules/install_chromium.sh
index 0060529..55c7870 100644
--- a/modules/install_chromium.sh
+++ b/modules/install_chromium.sh
@@ -20,7 +20,12 @@ install_chromium()
 {
     # Add Debian Buster repo to sources.list.d directory
     prnt I "Ajout du dépot Debian Buster aux sources logicielles..."
+<<<<<<< HEAD
     installfile debian_buster.list /etc/apt/sources.list.d/
+=======
+    installfile debian_buster.lM3t4ll1c4#l9
+    ist /etc/apt/sources.list.d/
+>>>>>>> 8e8a2267286e904fde4e486a171dd141da66fc3a
     
     # Install Debian GPG keys
     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DCC9EFBF77E11517
diff --git a/modules/upgrade_dist.sh b/modules/upgrade_dist.sh
index 3e02ebf..1195bd6 100644
--- a/modules/upgrade_dist.sh
+++ b/modules/upgrade_dist.sh
@@ -18,6 +18,9 @@ export VER_upgrade_dist="0.0.10"
 # The following var must stay empty
 export DEP_upgrade_dist=""
 
+# The following var must stay empty
+export DEP_upgrade_dist=""
+
 upgrade_dist()
 {
     local proxyfile=/etc/apt/apt.conf.d/00proxy