diff --git a/app/playlists.py b/app/playlists.py
index fadc8f3..0f67c76 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -897,6 +897,7 @@ class PlaylistTab(QTableWidget):
             self._set_row_colour_default(plr.row_number)
             _ = self._set_row_note_colour(session, row, plr.note)
             self._update_row_track_info(session, row, track)
+            self._update_start_end_times()
             self.clear_selection()
 
     def _build_context_menu(self, item: QTableWidgetItem) -> None:
@@ -1415,6 +1416,7 @@ class PlaylistTab(QTableWidget):
             if not plr:
                 return
             plr.played = False
+        self._update_start_end_times()
 
     def _move_row(self, session: scoped_session, plr: PlaylistRows,
                   new_row_number: int) -> None:
@@ -1513,10 +1515,24 @@ 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
+            QTimer.singleShot(0, self._update_start_end_times)
+
     def _rescan(self, row: int, track_id: int) -> None:
         """Rescan track"""
 
@@ -2120,7 +2136,6 @@ class PlaylistTab(QTableWidget):
         """ Update track start and end times """
 
         with Session() as session:
-            section_start_rows: List[PlaylistRows] = []
             current_track_end_time = self._get_current_track_end_time()
             current_track_row = self._get_current_track_row_number()
             current_track_start_time = self._get_current_track_start_time()