update subtree with repo and upstream changes