Merge remote-tracking branch 'origin/main' into codex/open-pr-all-changes-20260331

Author: jmbish04

.github/workflows/jules-merge-conflicts.txt

@@ -2,7 +2,7 @@ name: PR Code Block Merger
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened]
+    types: [opened]
   workflow_dispatch: # Allow manual triggers
 
 jobs: