Updating dist/ folder from last merge