From c37c4b752bccbe125533376e5eab4a6b5c5e93f1 Mon Sep 17 00:00:00 2001
From: Carl Cervone <42869436+ccerv1@users.noreply.github.com>
Date: Fri, 5 Apr 2024 16:51:21 -0400
Subject: [PATCH] Resolve conflicts (#1186)

* rebase projects by collection

* update projects by collection mart