fix: resolve merge conflicts in redis-commander and package.json

- Resolve merge conflicts in package.json (test:watch script)
- Resolve merge conflicts in jest.config.js
- Resolve merge conflicts in search-utils.ts (keep HEAD version with integrated types)
- Resolve merge conflicts in types.ts (keep SearchState interface)
- Resolve merge conflicts in search-utils.test.ts (keep HEAD test suite)
- Remove git merge conflict markers

Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>

Author: itsmeakhil

apps/web/jest.config.js

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const nextJest = require('next/jest')
 
@@ -23,17 +22,3 @@ const customJestConfig = {
 // createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 module.exports = createJestConfig(customJestConfig)
-=======
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  roots: ['<rootDir>/src'],
-  testMatch: ['**/__tests__/**/*.test.ts', '**/__tests__/**/*.test.tsx'],
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
-  collectCoverageFrom: [
-    'src/**/*.{ts,tsx}',
-    '!src/**/*.d.ts',
-    '!src/**/__tests__/**',
-  ],
-};
->>>>>>> 225d711942b1e1bfa9de978da2b96b412a61198a

apps/web/package.json

@@ -9,10 +9,7 @@
     "start": "next start",
     "lint": "eslint .",
     "test": "jest",
-<<<<<<< HEAD
     "test:watch": "jest --watch",
-=======
->>>>>>> 225d711942b1e1bfa9de978da2b96b412a61198a
     "clean-install": "rimraf node_modules && pnpm install --filter @mydevtools/web..."
   },
   "dependencies": {