updated dist files with latest merge