diff --git a/FullSimLight/src/MySteppingAction.cc b/FullSimLight/src/MySteppingAction.cc
index cec8a7dd976772d3701f1dbbdc23d95cff17bf3e..a375c6ed4b38be55054dd0d81544a566ca84e848 100644
--- a/FullSimLight/src/MySteppingAction.cc
+++ b/FullSimLight/src/MySteppingAction.cc
@@ -134,8 +134,4 @@ void MySteppingAction::UserSteppingAction(const G4Step* theStep) {
 
     }
   }
-
-=======
-  */
->>>>>>> 4ed68ed15e5487ec89cde8cfa8b3ed761c16eb66
 }
\ No newline at end of file