Merge master into main

Sources/MusicAssistantCore/Domain/SongProject.swift

@@ -343,6 +343,7 @@ public extension SongProject {
         versions.first { $0.id == versionID }
     }
 
+<<<<<<< HEAD
     mutating func restoreVersion(id versionID: String, restoredAt: Date = Date()) -> Bool {
         guard let version = version(id: versionID) else { return false }
         restoreSnapshot(version.snapshot, updatedAt: restoredAt)
@@ -373,6 +374,8 @@ public extension SongProject {
         self.updatedAt = updatedAt
     }
 
+=======
+>>>>>>> origin/master
     mutating func appendSection(_ section: SongSection) {
         var orderedSection = section
         orderedSection.order = nextSectionOrder