rebuilding dist files after merge from upstream