fix conflicts

diff --cc TimeZone.php
index f0e5fc1,e69d856..78f5a9a
--- 1/TimeZone.php
--- 2/TimeZone.php
+++ b/TimeZone.php
@@@ -76,6 -76,10 +76,12 @@@ class Pman_Core_TimeZone extends Pma
                  *, TIME_FORMAT(TIMEDIFF(NOW(), CONVERT_TZ(NOW(), Name, 'UTC')), '%H:%i') as timeOffset
              FROM
                  mysql.time_zone_name
 -                NAME NOT LIKE 'Etc%'
+             WHERE
+                 Name LIKE '%/%'
+                 AND
++                LENGTH(Name) - LENGTH(REPLACE(Name, '/', '')) = 1
++                AND
++                Name NOT LIKE 'Etc%'
              ORDER BY
                  timeoffset DESC,
                  Name DESC