nearly finished timezone form
fixed merge conflict and update hours for activity form