attaching rhosimulater/
fixed merge conflict
Updated time zone