diff --git a/src/tests/MuTransition/runMuSimulation.C b/src/tests/MuTransition/runMuSimulation.C
index 433d6f67..4c9f8395 100644
--- a/src/tests/MuTransition/runMuSimulation.C
+++ b/src/tests/MuTransition/runMuSimulation.C
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /***************************************************************************
 
   runMuSimulation.C
@@ -298,4 +297,3 @@ void runMuSimulation()
 
   delete [] histo;
 }
->>>>>>> 4fec25e423493c58fa21cedec161430f90ffc10d