fix: strip all conflict markers from Dechat/ tree (135 files)

The leojay-net/main upstream itself had conflict markers committed into
135 files across Dechat/dex_with_fiat_frontend/ and
Dechat/stellar-contracts/ — including package.json, locales, hooks,
components, API routes, lib files, and test snapshots.

Resolution: took the 'theirs' (emwulrd/main) side of every conflict
throughout, which matches the authoritative resolved state on main.

Also fixes:
- package.json: pool=forks for coverage shards, reporter=default for
  merge, added qrcode + @types/qrcode deps (from emwulrd/main)
- All JSON files validated before commit

Author: Dev-journals

Dechat/README.md

@@ -237,10 +237,6 @@ npm run precommit:eslint
 
 - **[TypeScript SDK Examples](docs/typescript-sdk-examples.md)** - Complete guide for calling new contract functions (`heartbeat`, `deny_address`, `migrate_escrow`, `execute_batch_admin`) from the TypeScript SDK with error handling patterns and code examples.
 
-<<<<<<< HEAD
-## Contributing!!
-Contributions and feature reviews are welcome. Please open up an issue to raise bugs or feature requests!
-=======
 ### Invariant tests (contracts)
 
 Alongside the per-issue regression tests, the `FiatBridge` suite has dedicated
@@ -294,4 +290,3 @@ keep review predictable:
   drive-by change; it is easier to review as its own fix.
 - **Scope** — one logical change per PR. Unrelated cleanups found along the way
   are better filed as issues.
->>>>>>> emwulrd/main

Dechat/dex_with_fiat_frontend/package.json

@@ -16,19 +16,11 @@
     "test:e2e:debug": "playwright test --debug",
     "test:e2e:install": "playwright install",
     "test:unit:watch": "vitest",
-<<<<<<< HEAD
-    "test:coverage:shard:1": "vitest run --coverage --maxWorkers=1 --pool=threads --no-file-parallelism --reporter=blob --reporter=dot --coverage.reporter=json --shard=1/4 --coverage.clean",
-    "test:coverage:shard:2": "vitest run --coverage --maxWorkers=1 --pool=threads --no-file-parallelism --reporter=blob --reporter=dot --coverage.reporter=json --shard=2/4 --coverage.clean=false",
-    "test:coverage:shard:3": "vitest run --coverage --maxWorkers=1 --pool=threads --no-file-parallelism --reporter=blob --reporter=dot --coverage.reporter=json --shard=3/4 --coverage.clean=false",
-    "test:coverage:shard:4": "vitest run --coverage --maxWorkers=1 --pool=threads --no-file-parallelism --reporter=blob --reporter=dot --coverage.reporter=json --shard=4/4 --coverage.clean=false",
-    "test:coverage:merge": "vitest run --mergeReports --coverage --reporter=text",
-=======
     "test:coverage:shard:1": "vitest run --coverage --maxWorkers=1 --pool=forks --no-file-parallelism --reporter=blob --reporter=dot --coverage.reporter=json --shard=1/4 --coverage.clean",
     "test:coverage:shard:2": "vitest run --coverage --maxWorkers=1 --pool=forks --no-file-parallelism --reporter=blob --reporter=dot --coverage.reporter=json --shard=2/4 --coverage.clean=false",
     "test:coverage:shard:3": "vitest run --coverage --maxWorkers=1 --pool=forks --no-file-parallelism --reporter=blob --reporter=dot --coverage.reporter=json --shard=3/4 --coverage.clean=false",
     "test:coverage:shard:4": "vitest run --coverage --maxWorkers=1 --pool=forks --no-file-parallelism --reporter=blob --reporter=dot --coverage.reporter=json --shard=4/4 --coverage.clean=false",
     "test:coverage:merge": "vitest run --mergeReports --coverage --reporter=default",
->>>>>>> emwulrd/main
     "test:coverage": "pnpm test:coverage:shard:1 && pnpm test:coverage:shard:2 && pnpm test:coverage:shard:3 && pnpm test:coverage:shard:4 && pnpm test:coverage:merge"
   },
   "dependencies": {
@@ -43,10 +35,7 @@
     "jspdf": "^4.2.1",
     "lucide-react": "^0.453.0",
     "next": "15.3.5",
-<<<<<<< HEAD
-=======
     "qrcode": "^1.5.4",
->>>>>>> emwulrd/main
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-is": "^19.2.4",
@@ -67,10 +56,7 @@
     "@testing-library/user-event": "^14.6.1",
     "@types/jest": "~30.0.0",
     "@types/node": "^20.19.37",
-<<<<<<< HEAD
-=======
     "@types/qrcode": "^1.5.6",
->>>>>>> emwulrd/main
     "@types/react": "^19",
     "@types/react-dom": "^19",
     "@types/uuid": "^10.0.0",

Dechat/dex_with_fiat_frontend/playwright-report/index.html

@@ -6,12 +6,8 @@ export default defineConfig({
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 0,
   workers: process.env.CI ? 1 : undefined,
-<<<<<<< HEAD
-  reporter: 'html',
-=======
   timeout: 60_000,
   reporter: process.env.CI ? [['github'], ['html']] : 'html',
->>>>>>> emwulrd/main
   use: {
     baseURL: 'http://localhost:3000',
     trace: 'on-first-retry',
@@ -32,15 +28,9 @@ export default defineConfig({
     },
   ],
   webServer: {
-<<<<<<< HEAD
-    command: 'npm run dev',
-    url: 'http://localhost:3000',
-    reuseExistingServer: !process.env.CI,
-=======
     command: process.env.CI ? 'npx next start' : 'npx next dev --turbopack',
     url: 'http://localhost:3000',
     reuseExistingServer: !process.env.CI,
     timeout: 120_000,
->>>>>>> emwulrd/main
   },
 });