merged

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,