diff --git a/Ref/Top/Topology.cpp b/Ref/Top/Topology.cpp
index d594dbf8a6..87aa3dfcb1 100644
--- a/Ref/Top/Topology.cpp
+++ b/Ref/Top/Topology.cpp
@@ -235,6 +235,7 @@ bool constructApp(bool dump, U32 port_number, char* hostname) {
 }
 
 void exitTasks(void) {
+    cmdSeq.deallocateBuffer(seqMallocator);
     rateGroup1Comp.exit();
     rateGroup2Comp.exit();
     rateGroup3Comp.exit();
diff --git a/mk/ci/tests/fputil.bash b/mk/ci/tests/fputil.bash
index 02503d3074..fa9b77897c 100755
--- a/mk/ci/tests/fputil.bash
+++ b/mk/ci/tests/fputil.bash
@@ -36,7 +36,11 @@ function fputil_action {
         fi
   
         # Generate is only needed when it isn't being tested
+<<<<<<< HEAD
         if [[ "${TARGET}" != "generate" ]] && [[ "${TEST_TYPE}" != "QUICK" ]]
+=======
+        if [[ "${TARGET}" != "generate" ]]
+>>>>>>> hpaulson: fix to memory leak in topology.cpp
         then
             echo "[INFO] Generating build cache before ${WORKDIR//\//_} '${TARGET}' execution"
             fprime-util "generate" --jobs "${JOBS}" ${PLATFORM} > "${LOG_DIR}/${WORKDIR//\//_}_pregen.out.log" 2> "${LOG_DIR}/${WORKDIR//\//_}_pregen.err.log" \