fix: Merge preference

Resolves #725

Author: sparkison

app/Jobs/MergeChannels.php

@@ -227,6 +227,14 @@ protected function filterDisabledGroups($group)
      */
     protected function selectMasterByWeightedScore($group, array $playlistPriority)
     {
+        // Enforce prefer catch-up as primary if enabled
+        if ($this->preferCatchupAsPrimary) {
+            $catchupChannels = $group->filter(fn ($channel) => ! empty($channel->catchup));
+            if ($catchupChannels->isNotEmpty()) {
+                $group = $catchupChannels;
+            }
+        }
+
         $scoredChannels = $group->map(function ($channel) use ($playlistPriority) {
             return [
                 'channel' => $channel,