diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
new file mode 100644
index 0000000..b8ced32
--- /dev/null
+++ b/.github/workflows/deploy.yaml
@@ -0,0 +1,45 @@
+name: deploy
+on: [push, workflow_dispatch]
+defaults:
+  run:
+    working-directory: launchpad
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - uses: actions/setup-node@v7
+      - run: npm clean-install
+      - run: npm run test
+<<<<<<< HEAD
+      - run: bash scripts/report.sh
+        env:
+          BOARD_URL: ${{ vars.BOARD_URL }}
+          SHIPIT_TOKEN: ${{ secrets.SHIPIT_TOKEN }}
+=======
+
+>>>>>>> a54da8e567af8f02ae985889b6237bf2e1bef416
+  deploy:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v7
+      - uses: actions/setup-node@v7
+      - run: npm clean-install
+      - run: npm run test
+      - run: npm run build
+      - uses: actions/upload-pages-artifact@v5
+        with:
+          path: launchpad/dist
+      - uses: actions/deploy-pages@v5
+
+<<<<<<< HEAD
+    permissions:
+      pages: write
+      id-token: write
+=======
+permissions:
+  pages: write
+  id-token: write
+>>>>>>> a54da8e567af8f02ae985889b6237bf2e1bef416
diff --git a/launchpad/ship.config.json b/launchpad/ship.config.json
index 34b4809..9f07dea 100644
--- a/launchpad/ship.config.json
+++ b/launchpad/ship.config.json
@@ -1,5 +1,13 @@
 {
+<<<<<<< HEAD
+<<<<<<< HEAD
   "shipName": "Nebula Runner",
+=======
+=======
+  "shipName": "DeathStar",
+>>>>>>> a54da8e567af8f02ae985889b6237bf2e1bef416
+  "shipName": "Deathstar",
+>>>>>>> b6ac115f6d29707cf5991188ad6e5d7e6a7c49ca
   "color": "#22d3ee",
   "shipModel": "fighter",
   "emblem": "comet"