fix: merge conflicts

Author: Rudra-Sankha-Sinhamahapatra

.github/workflows/lint-check.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 10.28.0
+          version: 10.28.1
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile --ignore-scripts

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 10.28.0
+          version: 10.28.1
 
       - name: Install Dependencies
         run: pnpm install --frozen-lockfile

apps/api/drizzle/migrations/0024_cloudy_cargill.sql

@@ -0,0 +1 @@
+ALTER TABLE "users" ADD COLUMN "desktop_version" text;