diff --git a/audio_player.py b/audio_player.py
index 7e9408b..384f835 100644
--- a/audio_player.py
+++ b/audio_player.py
@@ -73,24 +73,10 @@ class AudioPlayer(object):
         )
 
     def set_audio_player(self, fname = ""):
-<<<<<<< HEAD
-        if self.__load_timer.isActive():
-            self.__load_timer.stop()
-        self.fname = fname
-        self.__load_timer.start(self.__delay_load_audio)
-
-    def __set_audio_player(self):
-        self.__load_timer.stop()
-=======
         self.__first_call = True
->>>>>>> load_sound_on_request
         self.__reset_audio_widget()
         full_name = os.path.join('Data', 'Audio_wav', fname + '.wav')
         if os.path.exists(full_name):
-<<<<<<< HEAD
-            mixer.init(frequency = AudioSegment.from_wav(full_name).frame_rate)
-=======
->>>>>>> load_sound_on_request
             self.__play.setEnabled(True)
             self.__audio_file = full_name
 
diff --git a/main.py b/main.py
index 182ae40..7135ca7 100644
--- a/main.py
+++ b/main.py
@@ -27,21 +27,6 @@ class MyApp(QMainWindow, Ui_MainWindow):
         self.search_bar.textChanged.connect(self.display_signals)
         self.result_list.itemSelectionChanged.connect(self.display_specs)
         self.result_list.currentItemChanged.connect(self.display_specs)
-<<<<<<< HEAD
-        self.play.setIcon(qta.icon('fa5.play-circle',
-                                   color = "#4facf1",
-                                   color_disabled = '#7a7a7a'))
-        self.play.setIconSize(self.play.size())
-        self.pause.setIcon(qta.icon('fa5.pause-circle',
-                                    color = "#4facf1",
-                                    color_disabled = '#7a7a7a'))
-        self.pause.setIconSize(self.pause.size())
-        self.stop.setIcon(qta.icon('fa5.stop-circle',
-                                   color = "#4facf1",
-                                   color_disabled = '#7a7a7a'))
-        self.stop.setIconSize(self.stop.size())
-=======
->>>>>>> load_sound_on_request
         self.audio_widget = AudioPlayer(self.play, 
                                         self.pause, 
                                         self.stop,