diff --git a/core/core.php b/core/core.php
index 3a0d7e41..40212c18 100644
--- a/core/core.php
+++ b/core/core.php
@@ -1306,9 +1306,4 @@ class common
 		}
 		$zip->close();
 	}
-<<<<<<<<< Temporary merge branch 1
-}
-=========
-}
->>>>>>>>> Temporary merge branch 2
-
+}
\ No newline at end of file