diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php
index d17240db..4228000f 100644
--- a/code/CMSBatchAction.php
+++ b/code/CMSBatchAction.php
@@ -192,15 +192,7 @@ class CMSBatchAction_DeleteFromLive extends CMSBatchAction {
 			}
 
 		}
-<<<<<<< .working
 
 		return Convert::raw2json($status);
-=======
-		
-		return FormResponse::respond();
->>>>>>> .merge-right.r96789
 	}
-}
-
-
-
+}
\ No newline at end of file