From e6c22ad29ba95866939f4d8a4f5d412e623df54b Mon Sep 17 00:00:00 2001
From: Docker Config Backup <backup@example.com>
Date: Tue, 29 Jul 2025 15:01:45 +0200
Subject: [PATCH] Auto-save: Updated components/timeshift-spreadsheet.tsx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Auto-saved at 2025-07-29 15:01:45

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 components/timeshift-spreadsheet.tsx | 6 ++++++
 logs/auto-commit.log                 | 5 +++++
 logs/auto-commit.out.log             | 5 +++++
 3 files changed, 16 insertions(+)

diff --git a/components/timeshift-spreadsheet.tsx b/components/timeshift-spreadsheet.tsx
index 32b5382..d4fcf80 100644
--- a/components/timeshift-spreadsheet.tsx
+++ b/components/timeshift-spreadsheet.tsx
@@ -321,6 +321,12 @@ export function TimeshiftSpreadsheet({ teamId, teamName }: TimeshiftSpreadsheetP
                 for (let row = 1; row <= 5; row++) {
                   for (let col = 1; col < totalCols; col += 2) {
                     const colLetter = getExcelColumnName(col)
+                    
+                    // Skip merging for BZ and CA columns
+                    if (colLetter === 'BZ' || colLetter === 'CA') {
+                      continue
+                    }
+                    
                     try {
                       // Correct syntax: setMerge(cellAddress, colspan, rowspan)
                       instance.setMerge(`${colLetter}${row}`, 2, 1) // 2 columns, 1 row
diff --git a/logs/auto-commit.log b/logs/auto-commit.log
index e43a47a..b541579 100644
--- a/logs/auto-commit.log
+++ b/logs/auto-commit.log
@@ -56,3 +56,8 @@
 2025-07-29 14:54:37 +02:00: (node:652376) [DEP0060] DeprecationWarning: The `util._extend` API is deprecated. Please use Object.assign() instead.
 2025-07-29 14:54:37 +02:00: (Use `node --trace-deprecation ...` to show where the warning was created)
 2025-07-29 14:54:42 +02:00: 🔖 Creating restore point...
+2025-07-29 14:54:48 +02:00: ✅ Restore point created
+2025-07-29 15:01:15 +02:00: 📝 File changed: components/timeshift-spreadsheet.tsx (change)
+2025-07-29 15:01:15 +02:00: 📝 File changed: components/timeshift-spreadsheet.tsx (change)
+2025-07-29 15:01:15 +02:00: 📝 File changed: components/timeshift-spreadsheet.tsx (change)
+2025-07-29 15:01:45 +02:00: 🔄 Performing auto-commit...
diff --git a/logs/auto-commit.out.log b/logs/auto-commit.out.log
index c785222..964ca15 100644
--- a/logs/auto-commit.out.log
+++ b/logs/auto-commit.out.log
@@ -52,3 +52,8 @@
 2025-07-29 14:54:37 +02:00:   ./auto-commit.sh list
 2025-07-29 14:54:37 +02:00:   ./auto-commit.sh cleanup
 2025-07-29 14:54:42 +02:00: 🔖 Creating restore point...
+2025-07-29 14:54:48 +02:00: ✅ Restore point created
+2025-07-29 15:01:15 +02:00: 📝 File changed: components/timeshift-spreadsheet.tsx (change)
+2025-07-29 15:01:15 +02:00: 📝 File changed: components/timeshift-spreadsheet.tsx (change)
+2025-07-29 15:01:15 +02:00: 📝 File changed: components/timeshift-spreadsheet.tsx (change)
+2025-07-29 15:01:45 +02:00: 🔄 Performing auto-commit...