From 6be102bb4e07cb14804b89f5fb53fb26620d2ae4 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>