fix time zone
merge