Preparing to merge to master, updating dist folder