merge changes from original repository