Fix merge conflict

Author: abhipatel12

packages/cli/src/config/config.test.ts

@@ -2496,7 +2496,6 @@ describe('loadCliConfig useRipgrep', () => {
       process.argv = ['node', 'script.js'];
       const argv = await parseArguments({} as Settings);
       const settings: Settings = {};
-<<<<<<< HEAD
       const config = await loadCliConfig(
         settings,
         [],
@@ -2507,11 +2506,7 @@ describe('loadCliConfig useRipgrep', () => {
         'test-session',
         argv,
       );
-      expect(config.getUseModelRouter()).toBe(true);
-=======
-      const config = await loadCliConfig(settings, [], 'test-session', argv);
       expect(config.getUseModelRouter()).toBe(false);
->>>>>>> 8aace3af (Disable Routing by default (#11549))
     });
 
     it('should be true when useModelRouter is set to true in settings', async () => {