diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php
index 92f32cc1af..e17e045eec 100755
--- a/phpBB/language/lang_english.php
+++ b/phpBB/language/lang_english.php
@@ -6,11 +6,7 @@
  *     copyright            : (C) 2001 The phpBB Group
  *     email                : support@phpbb.com
  *
-<<<<<<< lang_english.php
  *     $Id$
-=======
- *     $Id$
->>>>>>> 1.104
  *
  *  ***************************************************************************/
 
@@ -621,36 +617,36 @@ $lang['Too_many_error'] = "You have selected too many posts. You can only select
 //
 $lang['All_times'] = "All times are"; // This is followed by GMT and the timezone offset
 
-$lang[-12] = "GMT - 12" . " " . $lang['Hours'];
-$lang[-11] = "GMT - 11" . " " . $lang['Hours'];
-$lang[-10] = "HST (Hawaii)";
-$lang[-9] = "GMT - 9" . " " . $lang['Hours'];
-$lang[-8] = "PST (U.S./Canada)";
-$lang[-7] = "MST (U.S./Canada)";
-$lang[-6] = "CST (U.S./Canada)";
-$lang[-5] = "EST (U.S./Canada)";
-$lang[-4] = "GMT - 4" . " " . $lang['Hours'];
-$lang[-3.5] = "GMT - 3.5" . " " . $lang['Hours'];
-$lang[-3] = "GMT - 3" . " " . $lang['Hours'];
-$lang[-2] = "Mid-Atlantic";
-$lang[-1] = "GMT - 1" . " " . $lang['Hour'];
-$lang[0] = "GMT";
-$lang[1] = "CET (Europe)";
-$lang[2] = "EET (Europe)";
-$lang[3] = "GMT + 3" . " " . $lang['Hours'];
-$lang[3.5] = "GMT + 3.5" . " " . $lang['Hours'];
-$lang[4] = "GMT + 4" . " " . $lang['Hours'];
-$lang[4.5] = "GMT + 4.5" . " " . $lang['Hours'];
-$lang[5] = "GMT + 5" . " " . $lang['Hours'];
-$lang[5.5] = "GMT + 5.5" . " " . $lang['Hours'];
-$lang[6] = "GMT + 6" . " " . $lang['Hours'];
-$lang[7] = "GMT + 7" . " " . $lang['Hours'];
-$lang[8] = "WST (Australia)";
-$lang[9] = "GMT + 9" . " " . $lang['Hours'];
-$lang[9.5] = "CST (Australia)";
-$lang[10] = "EST (Australia)";
-$lang[11] = "GMT + 11" . " " . $lang['Hours'];
-$lang[12] = "GMT + 12" . " " . $lang['Hours'];
+$lang['-12'] = "GMT - 12" . " " . $lang['Hours'];
+$lang['-11'] = "GMT - 11" . " " . $lang['Hours'];
+$lang['-10'] = "HST (Hawaii)";
+$lang['-9'] = "GMT - 9" . " " . $lang['Hours'];
+$lang['-8'] = "PST (U.S./Canada)";
+$lang['-7'] = "MST (U.S./Canada)";
+$lang['-6'] = "CST (U.S./Canada)";
+$lang['-5'] = "EST (U.S./Canada)";
+$lang['-4'] = "GMT - 4" . " " . $lang['Hours'];
+$lang['-3.5'] = "GMT - 3.5" . " " . $lang['Hours'];
+$lang['-3'] = "GMT - 3" . " " . $lang['Hours'];
+$lang['-2'] = "Mid-Atlantic";
+$lang['-1'] = "GMT - 1" . " " . $lang['Hour'];
+$lang['0'] = "GMT";
+$lang['1'] = "CET (Europe)";
+$lang['2'] = "EET (Europe)";
+$lang['3'] = "GMT + 3" . " " . $lang['Hours'];
+$lang['3.5'] = "GMT + 3.5" . " " . $lang['Hours'];
+$lang['4'] = "GMT + 4" . " " . $lang['Hours'];
+$lang['4.5'] = "GMT + 4.5" . " " . $lang['Hours'];
+$lang['5'] = "GMT + 5" . " " . $lang['Hours'];
+$lang['5.5'] = "GMT + 5.5" . " " . $lang['Hours'];
+$lang['6'] = "GMT + 6" . " " . $lang['Hours'];
+$lang['7'] = "GMT + 7" . " " . $lang['Hours'];
+$lang['8'] = "WST (Australia)";
+$lang['9'] = "GMT + 9" . " " . $lang['Hours'];
+$lang['9.5'] = "CST (Australia)";
+$lang['10'] = "EST (Australia)";
+$lang['11'] = "GMT + 11" . " " . $lang['Hours'];
+$lang['12'] = "GMT + 12" . " " . $lang['Hours'];
 
 //
 // Main Admin section/s