diff --git a/app/playlists.py b/app/playlists.py
index 0f67c76..904227b 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -1515,19 +1515,9 @@ class PlaylistTab(QTableWidget):
             # Set note text in correct column for section head
             _ = self._set_item_text(row, HEADER_NOTES_COLUMN, plr.note)
 
-<<<<<<< HEAD
-            _ = self._set_row_note_colour(session, row, plr.note,
-                                          section_header=True)
-||||||| c5f89db
-            note_colour = NoteColours.get_colour(session, plr.note)
-            if not note_colour:
-                note_colour = Config.COLOUR_NOTES_PLAYLIST
-            self._set_row_colour(row, QColor(note_colour))
-=======
             _ = self._set_row_note_colour(session, row, plr.note,
                                           section_header=True)
             self._update_start_end_times()
->>>>>>> dev
             self.clear_selection()
 
             # Set track start/end times after track list is populated