Index: firmware/App/HDCommon.h
===================================================================
diff -u -r3cae054c12e335800a5ec09cddfc97f6c067ce3e -r641b9ffafdde1a8e75901a0f119d79b4e6f55602
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 3cae054c12e335800a5ec09cddfc97f6c067ce3e)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 641b9ffafdde1a8e75901a0f119d79b4e6f55602)
@@ -8,7 +8,11 @@
 * @file    HDCommon.h
 *
 * @author  (last)      Dara Navaei
+<<<<<<< HEAD
 * @date    (last)      21-Mar-2024
+=======
+* @date    (last)      02-Nov-2024
+>>>>>>> staging
 *
 * @author  (original)  Sean
 * @date    (original)  27-Feb-2020
@@ -35,6 +39,7 @@
 //    #define BOARD_WITH_NO_HARDWARE          1           // Target is a PCB w/ no hardware
 //    #define SIMULATE_UI                     1           // Build w/o requirement that UI be there
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
+//    #define CARTRIDGE_TEST_BUILD            1           // Build to support cartridge testing
 
     #include <stdio.h>
     #include <strings.h>