diff --git a/auto-kol/agent/src/services/agents/nodes/autoApprovalNode.ts b/auto-kol/agent/src/services/agents/nodes/autoApprovalNode.ts
index 7ccce8b9..997a306f 100644
--- a/auto-kol/agent/src/services/agents/nodes/autoApprovalNode.ts
+++ b/auto-kol/agent/src/services/agents/nodes/autoApprovalNode.ts
@@ -7,11 +7,7 @@ import { uploadToDsn } from '../../../utils/dsn.js';
 import { config as globalConfig } from '../../../config/index.js';
 import { ResponseStatus } from '../../../types/queue.js';
 
-<<<<<<< HEAD
 export const createAutoApprovalNode = (config: WorkflowConfig) => {
-=======
-export const createAutoApprovalNode = (config: WorkflowConfig, scraper: ExtendedScraper) => {
->>>>>>> main
   return async (state: typeof State.State) => {
     logger.info('Auto Approval Node - Evaluating pending responses');
     try {
@@ -62,14 +58,10 @@ export const createAutoApprovalNode = (config: WorkflowConfig, scraper: Extended
               tweetId: response.tweet.id,
             });
 
-<<<<<<< HEAD
             const sendTweetResponse = await config.client.sendTweet(
               response.response,
               response.tweet.id,
             );
-=======
-            const sendTweetResponse = await scraper.sendTweet(response.response, response.tweet.id);
->>>>>>> main
             logger.info('Tweet sent', {
               sendTweetResponse,
             });
diff --git a/auto-kol/agent/src/services/agents/nodes/recheckSkippedNode.ts b/auto-kol/agent/src/services/agents/nodes/recheckSkippedNode.ts
index 8dff4d2e..0678c77d 100644
--- a/auto-kol/agent/src/services/agents/nodes/recheckSkippedNode.ts
+++ b/auto-kol/agent/src/services/agents/nodes/recheckSkippedNode.ts
@@ -51,13 +51,9 @@ export const createRecheckSkippedNode = (config: WorkflowConfig) => {
         } else {
           const flagged = await flagBackSkippedTweet(tweet.id, decision.reason);
           if (!flagged) {
-<<<<<<< HEAD
             logger.info('Failed to flag back skipped tweet:', {
               tweetId: tweet.id,
             });
-=======
-            logger.info('Failed to flag back skipped tweet:', { tweetId: tweet.id });
->>>>>>> main
           }
         }
       }
diff --git a/auto-kol/agent/src/tools/index.ts b/auto-kol/agent/src/tools/index.ts
index 53f07b53..a0a8f436 100644
--- a/auto-kol/agent/src/tools/index.ts
+++ b/auto-kol/agent/src/tools/index.ts
@@ -10,11 +10,7 @@ import { ExtendedScraper } from '../services/twitter/api.js';
 export const createTools = (scraper: ExtendedScraper) => {
   const mentionTool = createMentionTool(scraper);
 
-<<<<<<< HEAD
   const fetchTimelineTool = createFetchTimelineTool(scraper);
-=======
-  const fetchTimelineTool = createFetchTimelineTool();
->>>>>>> main
 
   const tweetSearchTool = createTweetSearchTool(scraper);
 
diff --git a/auto-kol/agent/src/tools/tools/fetchTimelineTool.ts b/auto-kol/agent/src/tools/tools/fetchTimelineTool.ts
index 2ed6d379..1a7a46b4 100644
--- a/auto-kol/agent/src/tools/tools/fetchTimelineTool.ts
+++ b/auto-kol/agent/src/tools/tools/fetchTimelineTool.ts
@@ -6,22 +6,14 @@ import { ExtendedScraper } from '../../services/twitter/api.js';
 
 const logger = createLogger('fetch-timeline-tool');
 
-<<<<<<< HEAD
 export const createFetchTimelineTool = (twitterScraper: ExtendedScraper) =>
-=======
-export const createFetchTimelineTool = () =>
->>>>>>> main
   new DynamicStructuredTool({
     name: 'fetch_timeline',
     description: 'Fetch the timeline regularly to get new tweets',
     schema: z.object({}),
     func: async () => {
       try {
-<<<<<<< HEAD
         const tweets = await getTimeLine(twitterScraper);
-=======
-        const tweets = await getTimeLine();
->>>>>>> main
         tweets.sort((a, b) => new Date(b.created_at).getTime() - new Date(a.created_at).getTime());
         return {
           tweets: tweets,
diff --git a/auto-kol/agent/src/tools/tools/tweetSearchTool.ts b/auto-kol/agent/src/tools/tools/tweetSearchTool.ts
index 8707bc66..62075e05 100644
--- a/auto-kol/agent/src/tools/tools/tweetSearchTool.ts
+++ b/auto-kol/agent/src/tools/tools/tweetSearchTool.ts
@@ -22,11 +22,7 @@ export const createTweetSearchTool = (scraper: ExtendedScraper) =>
     func: async ({ lastProcessedId }) => {
       try {
         logger.info('Called search_recent_tweets');
-<<<<<<< HEAD
         await updateKOLs(scraper);
-=======
-        await updateKOLs();
->>>>>>> main
         const kols = await getKOLsAccounts();
 
         if (kols.length === 0) {