apply merge changes from upstream