 					 * 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());

				ledOff(ledPins);
				lightChangeColor(storage.clashColor,true);
#ifdef LS_INFO
<<<<<<< HEAD
				Serial.print(F("COLOR2\nCur:"));
=======
				Serial.print(F("CLASH  COLOR\nCurrent:"));
>>>>>>> refs/remotes/origin/RGB-fork
				Serial.println(storage.clashColor[3]);
#endif
				enterMenu = false;

				ledOff(ledPins);
				lightChangeColor(storage.mainColor,true);
#ifdef LS_INFO
				Serial.print(F("COLOR1\nCur:"));
				Serial.println(storage.mainColor[3]);
#endif
				enterMenu = false;
