 					 * Last soundfile is over and has stopped :
 					 * We relaunch the hum !
 					 */
-<<<<<<< HEAD
 #ifdef LUXEON
 					lightChangeColor(storage.mainColor,true);
 #endif
-=======
-					lightChangeColor(storage.mainColor,true);
->>>>>>> refs/remotes/origin/RGB-fork
 #ifdef LS_RELAUNCH_DEBUG
 					Serial.print(F("MP3 stopped :"));
 					Serial.print(millis());

			if (enterMenu) {
				mp3.playTrackFromDir(5, 1);
#ifdef LS_INFO
<<<<<<< HEAD
				Serial.println(F("SOUNDFONT\nCur:"));
=======
				Serial.println(F("SOUNDFONT\nCurrent:"));
>>>>>>> refs/remotes/origin/RGB-fork
				Serial.println(soundFont.getFolder());
#endif
				enterMenu = false;

			} else if (value == 2 and play) {
				play = false;
				mp3.playTrackFromDir(15, 1/*, false*/);
				delay(500);
			} else if (value == SOUNDFONT_QUANTITY + 1 and play) {
				play = false;
				mp3.playTrackFromDir(14, 1/*, false*/);
				delay(500);
			}
			if (value != lastValue) {
				storage.soundFont = value;
				soundFont.setFolder(value);
				mp3.playTrackFromDir(soundFont.getBoot(), soundFont.getFolder()/*, false*/);
				delay(500);
				//mp3.playTrackFromDir(soundFont.getBoot(),soundFont.getFolder()/*, false*/);
#ifdef LUXEON
				storage.mainColor[3] = storage.soundFontColorPreset[value][0];
