From 60f01ef113a144e816f254d1acf0e2ca0e3889d5 Mon Sep 17 00:00:00 2001
From: github-actions <teamcity@labkey.com>
Date: Thu, 31 Oct 2024 17:11:36 +0000
Subject: [PATCH] Reset branch to develop before merging and resolving
 conflicts from 24.7