merged working schedule master with local