merge changes from upstream git repo