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

			if (enterMenu) {
				mp3.playTrackFromDir(6, 1);
#ifdef LS_INFO
<<<<<<< HEAD
				Serial.print(F("SWING\nCur:"));
=======
				Serial.print(F("SWING\nCurrent:"));
>>>>>>> refs/remotes/origin/RGB-fork
				Serial.print(storage.swingTreshold);
#endif
				enterMenu = false;

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