Resolve merge conflix

.github/workflows/railway-deploy.yml

@@ -7,8 +7,7 @@ on:
 
 jobs:
   deploy:
-    runs-on:
+    runs-on: ubuntu-latest
-      - host
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -34,3 +33,4 @@ jobs:
           if [ -n "${RAILWAY_SERVICE_ID:-}" ]; then SERVICE_FLAG="--service ${RAILWAY_SERVICE_ID}"; fi
           # Deploy current repo; --yes to skip prompts
           railway up $PROJECT_FLAG $SERVICE_FLAG --yes
+

tsconfig.json

@@ -2,7 +2,9 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-			"~/*": ["./src/lib/*"]
+      "~/*": [
+        "./src/lib/*"
+      ]
     },
     "plugins": [
       {
@@ -10,7 +12,13 @@
       }
     ]
   },
-	"exclude": ["node_modules"],
+  "exclude": [
+    "node_modules"
+  ],
   "extends": "@rubriclab/config/tsconfig",
-	"include": ["**/*.ts", "**/*.tsx", ".next/types/**/*.ts"]
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts"
+  ]
 }