diff --git a/app/dbtables.py b/app/dbtables.py
index 48f367e..95945c6 100644
--- a/app/dbtables.py
+++ b/app/dbtables.py
@@ -90,11 +90,11 @@ class PlaylistRowsTable(Model):
     __tablename__ = "playlist_rows"
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
-    row_number: Mapped[int]
+    row_number: Mapped[int] = mapped_column(index=True)
     note: Mapped[str] = mapped_column(
         String(2048), index=False, default="", nullable=False
     )
-    playlist_id: Mapped[int] = mapped_column(ForeignKey("playlists.id"))
+    playlist_id: Mapped[int] = mapped_column(ForeignKey("playlists.id"), index=True)
     playlist: Mapped[PlaylistsTable] = relationship(back_populates="rows")
     track_id: Mapped[Optional[int]] = mapped_column(ForeignKey("tracks.id"))
     track: Mapped["TracksTable"] = relationship(
diff --git a/app/musicmuster.py b/app/musicmuster.py
index 32fbba5..46a84a0 100755
--- a/app/musicmuster.py
+++ b/app/musicmuster.py
@@ -1069,14 +1069,8 @@ class Window(QMainWindow, Ui_MainWindow):
         else:
             webbrowser.get("browser").open_new_tab(url)
 
-<<<<<<< HEAD
-    def paste_rows(self) -> None:
-||||||| parent of 6879950 (Re-add profiling calls)
-    def paste_rows(self, dummy_for_profiling=None) -> None:
-=======
     @line_profiler.profile
     def paste_rows(self, dummy_for_profiling=None) -> None:
->>>>>>> 6879950 (Re-add profiling calls)
         """
         Paste earlier cut rows.
         """