From cb79cc7b045f41ec33ced5c6acbf4d6114c7cdf2 Mon Sep 17 00:00:00 2001
From: Sarah Sanders <sarah.sanders@docker.com>
Date: Mon, 14 Jul 2025 15:38:47 -0400
Subject: [PATCH] fix: published conflict (#23089)

## Description
- Fix conflict in published branch