# Conflicts:
#	lib/l10n/arb/app_de.arb
#	lib/l10n/arb/app_en.arb
#	lib/l10n/generated/app_localizations_de.dart
#	lib/presentation/views/main_menu/settings_view.dart

@@ -248,0 +250,4 @@
+              // Excludes already selected players from the suggested players list.
+              suggestedPlayers = loadedPlayers.where((p) => !widget.initialSelectedPlayers!.any((ip) => ip.id == p.id)).toList();
+              // Ensures that only players available for selection are pre-selected.
+              selectedPlayers = widget.initialSelectedPlayers!

@@ -146,3 +148,3 @@
                     ? null
                     : () async {
-                        late Group? updatedGroup;
+                        Group? updatedGroup;

@@ -191,1 +158,4 @@
 
+  /// Saves the group by creating a new one or updating the existing one,
+  /// depending on whether the widget  is in edit mode.
+  Future<void> _saveGroup() async {

@@ -338,6 +338,17 @@ class MatchDao extends DatabaseAccessor<AppDatabase> with _$MatchDaoMixin {
     return rowsAffected > 0;
   }
 
+  /// Entfernt die Gruppen-Verknüpfung des Matches mit der gegebenen [matchId].

@@ -341,0 +341,4 @@
+  /// Entfernt die Gruppen-Verknüpfung des Matches mit der gegebenen [matchId].
+  /// Setzt die groupId auf null.
+  /// Gibt `true` zurück, wenn mehr als 0 Zeilen betroffen waren, ansonsten `false`.
+  Future<bool> deleteMatchGroup({required String matchId}) async {

@@ -192,0 +190,4 @@
+    return (success, updatedGroup);
+  }
+
+  Future<void> deleteObsoleteMatchGroupRelations() async {

@@ -192,0 +191,4 @@
+  }
+
+  Future<void> deleteObsoleteMatchGroupRelations() async {
+    final matches = await db.matchDao.getAllMatches();

@@ -195,0 +194,4 @@
+                        return CreateGroupView(
+                          groupToEdit: _group,
+                          onMembersChanged: () {
+                            isLoading = true;

@@ -308,2 +308,4 @@
       expect(fetchedMatch.winner!.id, testPlayer5.id);
     });
+
+    // Tests for removeMatchGroup

@@ -310,0 +323,4 @@
+          matchId: testMatch1.id,
+        );
+        expect(updatedMatch.group, null);
+        // Andere Felder bleiben unverändert

@@ -310,0 +338,4 @@
+        final removed = await database.matchDao.deleteMatchGroup(
+          matchId: testMatchOnlyPlayers.id,
+        );
+        // Update sollte trotzdem eine Zeile betreffen

@@ -172,2 +173,4 @@
   }
 
+  /// Retrieves all matches associated with the given [groupId].
+  Future<List<Match>> getGroupMatches({required String groupId}) async {