No idea what happeend with last commit but git

broke something. Trying to recommit the changes.

Author: jd-code76

modules/navigation.js

@@ -125,7 +125,6 @@ export async function randomPassage() {
     }
 }
 export function nextPassage() {
-<<<<<<< HEAD
     let bookIdx = BOOK_ORDER.indexOf(state.settings.manualBook);
     let chap = state.settings.manualChapter;
     const maxCh = CHAPTER_COUNTS[state.settings.manualBook];
@@ -158,95 +157,21 @@ export function prevPassage() {
     updateManualNavigation(nextBook, nextChapter);
 }
 function updateManualNavigation(book, chapter) {
-=======
-    if (state.settings.readingMode === 'readingPlan') {
-        const plan = getActivePlan();
-        const len = plan.length;
-        let newIndex = (state.settings.currentPassageIndex + 1) % len;
-        if (newIndex < 0) newIndex = len - 1;
-        state.settings.currentPassageIndex = newIndex;
-        const passage = plan[newIndex];
-        const translation = getCurrentTranslation();
-        updateURL(translation, passage.book, passage.chapter);
-        updateUIMode('readingPlan', translation, passage.displayRef);
-        loadPassage(passage.book, passage.chapter, translation);
-        syncSelectorsToReadingPlan();
-    } else {
-        let bookIdx = BOOK_ORDER.indexOf(state.settings.manualBook);
-        let chap = state.settings.manualChapter;
-        const maxCh = CHAPTER_COUNTS[state.settings.manualBook];
-        let nextBook = state.settings.manualBook;
-        let nextChapter = chap;
-        if (chap < maxCh) {
-            nextChapter = chap + 1;
-        } else if (bookIdx < BOOK_ORDER.length - 1) {
-            nextBook = BOOK_ORDER[bookIdx + 1];
-            nextChapter = 1;
-        } else {
-            return;
-        }
-        updateManualNavigation(nextBook, nextChapter);
-    }
-    document.getElementById('scriptureSection').scrollTop = 0;
-}
-export function prevPassage() {
-    if (state.settings.readingMode === 'readingPlan') {
-        const plan = getActivePlan();
-        const len = plan.length;
-        let newIndex = (state.settings.currentPassageIndex - 1 + len) % len;
-        state.settings.currentPassageIndex = newIndex;
-        const passage = plan[newIndex];
-        const translation = getCurrentTranslation();
-        updateURL(translation, passage.book, passage.chapter);
-        updateUIMode('readingPlan', translation, passage.displayRef);
-        loadPassage(passage.book, passage.chapter, translation);
-        syncSelectorsToReadingPlan();
-    } else {
-        let bookIdx = BOOK_ORDER.indexOf(state.settings.manualBook);
-        let chap = state.settings.manualChapter;
-        let nextBook = state.settings.manualBook;
-        let nextChapter = chap;
-        if (chap > 1) {
-            nextChapter = chap - 1;
-        } else if (bookIdx > 0) {
-            const prevBook = BOOK_ORDER[bookIdx - 1];
-            nextBook = prevBook;
-            nextChapter = CHAPTER_COUNTS[prevBook];
-        } else {
-            return;
-        }
-        updateManualNavigation(nextBook, nextChapter);
-    }
-    document.getElementById('scriptureSection').scrollTop = 0;
-}
-function updateManualNavigation(book, chapter) {
-    state.settings.readingMode = 'manual';
->>>>>>> d11be95798768600c1b682f2957094b98cdb2d61
     state.settings.manualBook = book;
     state.settings.manualChapter = chapter;
     const translation = getCurrentTranslation();
     updateURL(translation, book, chapter);
     const displayRef = `${book} ${chapter}`;
-<<<<<<< HEAD
     updateUIMode(translation, displayRef);
-=======
-    updateUIMode('manual', translation, displayRef);
->>>>>>> d11be95798768600c1b682f2957094b98cdb2d61
     loadSelectedChapter(book, chapter);
     syncBookChapterSelectors();
     saveToStorage();
     if (state.settings.referencePanelOpen) {
         updateReferencePanel();
     }
 }
-<<<<<<< HEAD
 function updateUIMode(translation, displayRef) {
     const headerTitleEl = document.getElementById('passageHeaderTitle');
-=======
-function updateUIMode(mode, translation, displayRef) {
-    const headerTitleEl = document.getElementById('passageHeaderTitle');
-    const planLabelEl = document.getElementById('planLabel');
->>>>>>> d11be95798768600c1b682f2957094b98cdb2d61
     const passageRefElement = document.getElementById('passageReference');
     if (headerTitleEl) {
         headerTitleEl.textContent = `Holy Bible: ${translation}`;
@@ -255,16 +180,6 @@ function updateUIMode(mode, translation, displayRef) {
         passageRefElement.textContent = displayRef;
         state.currentPassageReference = displayRef;
     }
-<<<<<<< HEAD
-=======
-    if (planLabelEl) {
-        if (mode === 'readingPlan') {
-            planLabelEl.textContent = `Reading plan: ${getCurrentPlanLabel()}`;
-        } else {
-            planLabelEl.textContent = '';
-        }
-    }
->>>>>>> d11be95798768600c1b682f2957094b98cdb2d61
 }
 export function syncBookChapterSelectors() {
     const bookSel = document.getElementById('bookSelect');
@@ -345,10 +260,6 @@ export function navigateFromURL() {
     return false;
 }
 function loadDefaultPassage(params) {
-<<<<<<< HEAD
-=======
-    state.settings.readingMode = 'readingPlan';
->>>>>>> d11be95798768600c1b682f2957094b98cdb2d61
     state.settings.manualBook = params.book;
     state.settings.manualChapter = params.chapter;
     state.settings.bibleTranslation = params.translation;

modules/settings.js

@@ -91,30 +91,6 @@ export function importData(ev) {
     reader.readAsText(file);
     ev.target.value = '';
 }
-<<<<<<< HEAD
-=======
-export function resumeReadingPlan() {
-    const curBook    = state.settings.manualBook;
-    const curChapter = state.settings.manualChapter;
-    const idx        = findReadingPlanIndex(curBook, curChapter);
-    const translation = getCurrentTranslation();
-    updateURL(translation, curBook, curChapter);
-    if (idx !== -1) {
-        state.settings.currentPassageIndex = idx;
-    }
-    state.settings.readingMode = 'readingPlan';
-    loadPassage();
-}
-function findReadingPlanIndex(book, chapter) {
-   for (let i = 0; i < readingPlan.length; i++) {
-       const p = readingPlan[i];
-       if (p.book === book && p.chapter === chapter) {
-           return i;
-       }
-   }
-   return -1;   
-}
->>>>>>> d11be95798768600c1b682f2957094b98cdb2d61
 export function openSettings() {
     document.getElementById('bibleTranslationSetting').value = 
         state.settings.bibleTranslation;
@@ -166,22 +142,6 @@ export async function saveSettings() {
         handleError(err, 'saveSettings');
     } 
 }
-<<<<<<< HEAD
-=======
-export function restartReadingPlan() {
-    if (confirm('Reset the reading plan to the very first passage? Highlights and notes will stay unchanged.')) {
-        state.settings.currentPassageIndex = 0;
-        state.settings.readingMode = 'readingPlan';
-        saveToStorage();
-        loadPassage();
-        alert('Reading plan restarted – you are now at the beginning.');
-        const curBook    = state.settings.manualBook;
-        const curChapter = state.settings.manualChapter;
-        const translation = getCurrentTranslation();
-        updateURL(translation, curBook, curChapter);
-    }
-}
->>>>>>> d11be95798768600c1b682f2957094b98cdb2d61
 export async function clearCache() {
     if (confirm('Clear all cached Bible data? This will remove offline access to previously viewed passages.')) {
         try {

modules/state.js

@@ -1,10 +1,6 @@
 import { handleError } from '../main.js'
 import { loadPDFFromIndexedDB } from './pdf.js'
-<<<<<<< HEAD
 export const APP_VERSION = '1.1.05.2025.11.06';
-=======
-export const APP_VERSION = '1.1.04.2025.11.06';
->>>>>>> d11be95798768600c1b682f2957094b98cdb2d61
 let saveTimeout = null;
 const SAVE_DEBOUNCE_MS = 500;
 export const BOOK_ORDER = [