diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergNavBar.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergNavBar.jsx
index 827a9f12..68d541cc 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergNavBar.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergNavBar.jsx
@@ -1,10 +1,10 @@
 // import { Cog8ToothIcon } from '@heroicons/react/24/outline';
-import { useTranslation } from 'react-i18next';
+// import { useTranslation } from 'react-i18next';
 
 function TranslationMergNavBar({
   conflictedBooks, selectedBook, setSelectedBook, resolvedBooks, disableSelection, conflictedChapters, selectedChapter, setSelectedChapter,
 }) {
-  const { t } = useTranslation();
+  // const { t } = useTranslation();
   return (
     <div className="bg-white border-2 rounded-md border-black h-[78vh] overflow-hidden ">
       <div className="flex items-center justify-between bg-black py-1.5 px-2.5">
diff --git a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
index 827ea07c..510f3f9b 100644
--- a/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
+++ b/renderer/src/components/TextTranslationMerge/TranslationMergeUI.jsx
@@ -10,12 +10,13 @@ import { readUsfmFile } from '@/core/projects/userSettings';
 import localforage from 'localforage';
 import { flushSync } from 'react-dom';
 import TranslationMergNavBar from './TranslationMergNavBar';
-import * as logger from '../../logger';
+// import * as logger from '../../logger';
 import LoadingScreen from '../Loading/LoadingScreen';
 import UsfmConflictEditor from './UsfmConflictEditor';
 import { processAndIdentiyVerseChangeinUSFMJsons } from './processUsfmObjs';
 import packageInfo from '../../../../package.json';
 import { commitChanges } from '../Sync/Isomorphic/utils';
+/* eslint-disable import/no-unresolved , import/extensions */
 import { useGrammartoPerf } from '@/hooks2/useGrammartoPerf';
 
 const grammar = require('usfm-grammar');
diff --git a/renderer/src/components/TextTranslationMerge/UsfmConflictEditor.jsx b/renderer/src/components/TextTranslationMerge/UsfmConflictEditor.jsx
index 97120a27..d1ca1c3f 100644
--- a/renderer/src/components/TextTranslationMerge/UsfmConflictEditor.jsx
+++ b/renderer/src/components/TextTranslationMerge/UsfmConflictEditor.jsx
@@ -2,9 +2,10 @@
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
-  ArrowSmallDownIcon, ArrowSmallUpIcon, ArrowsUpDownIcon, ArrowPathRoundedSquareIcon,
+  ArrowSmallDownIcon, ArrowSmallUpIcon, ArrowPathRoundedSquareIcon,
 } from '@heroicons/react/20/solid';
 
+/* eslint-disable no-unused-vars */
 function UsfmConflictEditor({
   usfmJsons, currentProjectMeta, selectedChapter, setUsfmJsons, setChapterResolveDone, resolvedChapters, selectedBook, resolvedBooks, conflictedChapters,
 }) {