merge sync with upstream