fix import player, new columns remove telescope, consider emty vars in PlayerDataMerge

app/Traits/PlayerProps/PlayerDataMerge.php

@@ -15,6 +15,9 @@ trait PlayerDataMerge
             $part2 = $filtered_part_2[$players_id] ?? [];
 
             $this->players[$k]['active'] = $part1['active'] ?? 0;
+            if (! $this->players[$k]['active'] && isset($part2['active']) && $part2['active'] == 1) {
+                $this->players[$k]['active'] = 1;
+            }
 
             $bets = ['gls', 'crn', 'fls', 'ofs', 'crd', 'snt', 'tsh', 'wfl'];
             foreach ($bets as $bet) {
@@ -28,6 +31,12 @@ trait PlayerDataMerge
         $val1 = $part1[$bettype] ?? 0;
         $val2 = $part2[$bettype] ?? 0;
 
-        return number_format(($val2 * (100 - $this->part_1_value) + $val1 * $this->part_1_value) / 100, 3);
+        if ($val1 && $val1) {
+            return number_format(($val2 * (100 - $this->part_1_value) + $val1 * $this->part_1_value) / 100, 3);
+        } elseif ($val1) {
+            return number_format($val1, 3);
+        } elseif ($val2) {
+            return number_format($val2, 3);
+        }
     }
 }