diff --git a/workspace-server/internal/handlers/delegation_list_test.go b/workspace-server/internal/handlers/delegation_list_test.go
index 91416d4b..fff9330c 100644
--- a/workspace-server/internal/handlers/delegation_list_test.go
+++ b/workspace-server/internal/handlers/delegation_list_test.go
@@ -485,10 +485,3 @@ func TestListDelegationsFromActivityLogs_RowsErr(t *testing.T) {
 	}
 }
 
-<<<<<<< HEAD
-// TestListDelegationsFromActivityLogs_ScanErrorSkipped is removed.
-//
-// Same reason as TestListDelegationsFromLedger_ScanError: Go 1.25 causes
-// sqlmock.NewRows([]string{}).AddRow(...) to panic in test SETUP. The handler
-// has no recover(), so a scan panic would crash the process — the correct
-// behaviour. Real-DB integration tests cover this path.