diff --git a/qt/scientific_interfaces/Indirect/IqtFit.h b/qt/scientific_interfaces/Indirect/IqtFit.h
index 3b5c64a2ff6cef603efd1d4c70d828e9547c0ce0..69c1a9ee03fefa8e4ace5daea56d046e87ddabb3 100644
--- a/qt/scientific_interfaces/Indirect/IqtFit.h
+++ b/qt/scientific_interfaces/Indirect/IqtFit.h
@@ -32,16 +32,8 @@ private:
 
 protected:
   bool shouldEnablePlotResult() override { return true; };
-<<<<<<< HEAD
-<<<<<<< HEAD
 
   void setRunEnabled(bool enabled) override;
-=======
-  bool allowPlotResultWithOneSpectra() override { return true; }
-=======
->>>>>>> Show message box if one spectra in Multiple Input Refs #23164
-
->>>>>>> Plot Result only for workspaces with multiple spectra Refs #23164
   void setPlotResultEnabled(bool enabled) override;
   void setSaveResultEnabled(bool enabled) override;
 
diff --git a/qt/scientific_interfaces/Indirect/JumpFit.h b/qt/scientific_interfaces/Indirect/JumpFit.h
index 0c4f0176ce148ec1fac0675b33290f7b1dd076cf..f7dd8f9491499e8498175c6474893732f6b25d0b 100644
--- a/qt/scientific_interfaces/Indirect/JumpFit.h
+++ b/qt/scientific_interfaces/Indirect/JumpFit.h
@@ -27,16 +27,8 @@ protected slots:
 
 protected:
   bool shouldEnablePlotResult() override;
-<<<<<<< HEAD
-<<<<<<< HEAD
 
   void setRunEnabled(bool enabled) override;
-=======
-  bool allowPlotResultWithOneSpectra() override { return false; }
-=======
->>>>>>> Show message box if one spectra in Multiple Input Refs #23164
-
->>>>>>> Plot Result only for workspaces with multiple spectra Refs #23164
   void setPlotResultEnabled(bool enabled) override;
   void setSaveResultEnabled(bool enabled) override;
 
diff --git a/qt/scientific_interfaces/Indirect/MSDFit.h b/qt/scientific_interfaces/Indirect/MSDFit.h
index 54e3f7ae62c33f6a700ab1890b007c3a1cc39c3e..4937eaba377350a3c6c12265002efa5640f18077 100644
--- a/qt/scientific_interfaces/Indirect/MSDFit.h
+++ b/qt/scientific_interfaces/Indirect/MSDFit.h
@@ -27,16 +27,8 @@ protected slots:
 
 protected:
   bool shouldEnablePlotResult() override;
-<<<<<<< HEAD
-<<<<<<< HEAD
 
   void setRunEnabled(bool enabled) override;
-=======
-  bool allowPlotResultWithOneSpectra() override { return false; }
-=======
->>>>>>> Show message box if one spectra in Multiple Input Refs #23164
-
->>>>>>> Plot Result only for workspaces with multiple spectra Refs #23164
   void setPlotResultEnabled(bool enabled) override;
   void setSaveResultEnabled(bool enabled) override;