Fix merge issue

src/core/game/PlayerImpl.ts

@@ -906,6 +906,9 @@ export class PlayerImpl implements Player {
     if (unit.isMarkedForDeletion()) {
       return false;
     }
+    if (unit.owner() !== this) {
+      return false;
+    }
     if (!skipUnitTypeCheck && !this.canUpgradeUnitType(unit.type())) {
       return false;
     }
@@ -935,9 +938,6 @@ export class PlayerImpl implements Player {
     if (!this.isAlive()) {
       return false;
     }
-    if (unit.owner() !== this) {
-      return false;
-    }
     return true;
   }