Auto-save: Updated components/timeshift-spreadsheet.tsx

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

@@ -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