Merge changes from original repository