diff --git a/src/musredit_qt5/musredit/PTextEdit.cpp b/src/musredit_qt5/musredit/PTextEdit.cpp
index eca3190b..392447a8 100644
--- a/src/musredit_qt5/musredit/PTextEdit.cpp
+++ b/src/musredit_qt5/musredit/PTextEdit.cpp
@@ -2641,17 +2641,15 @@ void PTextEdit::musrT0()
 
   // make sure that the system environment variables are properly set
   QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-<<<<<<< HEAD
+#if defined(Q_OS_DARWIN)
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
+             env.value("DKS") + "/lib:" +
+             env.value("DYLD_LIBRARY_PATH"));
+#else
   env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
              env.value("DKS") + "/lib:" +
              env.value("LD_LIBRARY_PATH"));
-=======
-#if defined(Q_OS_DARWIN)
-  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
-#else
-  env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
 #endif
->>>>>>> c754275... adopted the the new dyld on macOS Monterey.
   proc->setProcessEnvironment(env);
   proc->setWorkingDirectory(workDir);
   proc->start(cmd, arg);
@@ -2688,17 +2686,15 @@ void PTextEdit::musrFT()
     proc->setStandardErrorFile("musrFT.log");
     QString cmd = fAdmin->getExecPath() + "/musrFT";
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-<<<<<<< HEAD
-    env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
-               env.value("DKS") + "/lib:" +
-               env.value("LD_LIBRARY_PATH"));
-=======
 #if defined(Q_OS_DARWIN)
-  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("DYLD_LIBRARY_PATH"));
+  env.insert("DYLD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
+             env.value("DKS") + "/lib:" +
+             env.value("DYLD_LIBRARY_PATH"));
 #else
-  env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" + env.value("LD_LIBRARY_PATH"));
+  env.insert("LD_LIBRARY_PATH", env.value("ROOTSYS") + "/lib:" +
+             env.value("DKS") + "/lib:" +
+             env.value("LD_LIBRARY_PATH"));
 #endif
->>>>>>> c754275... adopted the the new dyld on macOS Monterey.
     proc->setProcessEnvironment(env);
     proc->start(cmd, fMusrFTPrevCmd);
     if (!proc->waitForStarted()) {