diff --git a/src/gui/audio_select.cpp b/src/gui/audio_select.cpp
index e9960fb03..08a750648 100644
--- a/src/gui/audio_select.cpp
+++ b/src/gui/audio_select.cpp
@@ -184,11 +184,7 @@ int CAudioSelectMenuHandler::doMenu ()
 		}
 		perc_str[i] = to_string(perc_val[i]) + "%";
 
-<<<<<<< HEAD
-		CMenuForwarder *fw = new CMenuForwarder(is_mp ? mp->getAPIDDesc(i).c_str() : g_RemoteControl->current_PIDs.APIDs[i].desc, 
-=======
 		CMenuForwarder *fw = new CMenuForwarder(is_mp ? mp->getAPIDDesc(i).c_str() : g_RemoteControl->current_PIDs.APIDs[i].desc,
->>>>>>> ni/tuxbox
 				true, perc_str[i], this, "s", CRCInput::convertDigitToKey(i + 1));
 		fw->setItemButton(NEUTRINO_ICON_BUTTON_OKAY, true);
 		fw->setMarked(sel_apid == i);