merge changes from original into fork