added missing pytz requirement
fixed merge conflicts with requirements