merge js too