diff --git a/administrator/components/com_jedchecker/language/en-GB/en-GB.com_jedchecker.ini b/administrator/components/com_jedchecker/language/en-GB/en-GB.com_jedchecker.ini
index bff09a4..3ca2359 100644
--- a/administrator/components/com_jedchecker/language/en-GB/en-GB.com_jedchecker.ini
+++ b/administrator/components/com_jedchecker/language/en-GB/en-GB.com_jedchecker.ini
@@ -90,8 +90,6 @@ COM_JEDCHECKER_INFO_XML_UPDATE_SERVER_LINK="The Update Server link in this XML f
 COM_JEDCHECKER_DELETE_FAILED="Can't delete temporary folder"
 COM_JEDCHECKER_DELETE_SUCCESS="Temporary folder deleted!"
 COM_JEDCHECKER_EMPTY_UPLOAD_FIELD="Please, select a zipped file to be uploaded"
-<<<<<<< HEAD
-<<<<<<< HEAD
 COM_JEDCHECKER_TOOLBAR_CHECK="Check"
 COM_JEDCHECKER_TOOLBAR_CLEAR="Clear"
 COM_JEDCHECKER_CLICK_TO_VIEW_DETAILS="Click to View Details"