From 056db6d60c770966a7f5e6f737a7c5c3d540781a Mon Sep 17 00:00:00 2001
From: Jack Rosati <168000881+jrosati-burwood@users.noreply.github.com>
Date: Mon, 21 Oct 2024 15:48:18 -0500
Subject: [PATCH] Bugfix/merge conflict (#292)

Co-authored-by: Jared Trouth <74978887+jtrouth@users.noreply.github.com>