 				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;

			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;

			if (enterMenu) {
				mp3.playTrackFromDir(8, 1);
#ifdef LS_INFO
				Serial.print(F("CLASH2\nCur:"));
				Serial.print(storage.clashBrakeTreshold);
#endif
				enterMenu = false;
