update sync with upstream