fixed overlapping commits, timezone fix got overwritten