From 2ee6bfc7eaf2b2e497533164aa9333456abbda13 Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Mon, 23 Mar 2026 16:19:31 +0000
Subject: [PATCH] Resolve merge conflicts with main

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>