Resolve merge conflix

.github/workflows/railway-deploy.yml

@@ -2,13 +2,12 @@ name: Deploy to Railway
 
 on:
   push:
-    branches: ["main"]
+    branches: [ "main" ]
   workflow_dispatch:
 
 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

@@ -1,16 +1,24 @@
 {
-	"compilerOptions": {
+  "compilerOptions": {
-		"baseUrl": ".",
+    "baseUrl": ".",
-		"paths": {
+    "paths": {
-			"~/*": ["./src/lib/*"]
+      "~/*": [
-		},
+        "./src/lib/*"
-		"plugins": [
+      ]
-			{
+    },
-				"name": "next"
+    "plugins": [
-			}
+      {
-		]
+        "name": "next"
-	},
+      }
-	"exclude": ["node_modules"],
+    ]
-	"extends": "@rubriclab/config/tsconfig",
+  },
-	"include": ["**/*.ts", "**/*.tsx", ".next/types/**/*.ts"]
+  "exclude": [
+    "node_modules"
+  ],
+  "extends": "@rubriclab/config/tsconfig",
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    ".next/types/**/*.ts"
+  ]
 }