built dist files after upstream merge