diff --git a/run_music_background b/run_music_background
index e4718c8..8701670 100644
--- a/run_music_background
+++ b/run_music_background
@@ -2,7 +2,12 @@
 
 path_files=/home/cedric24c/Musique/non_stop_music
 files=($path_files/*)
+<<<<<<< HEAD
 volume=0.06
+=======
+volume=0.02
+
+>>>>>>> 0150ef4 (Initialisation)
 
 echo Process number $$
 echo Path files : $path_files
@@ -13,3 +18,8 @@ while [ 1 ];do
     echo Now playing $file
     play -v $volume "$file" &> /dev/null
 done
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> 0150ef4 (Initialisation)