Refactor merge Fix time zone conversion