merge changes from upstream that were lost