remove nonworking cachebuster urls
fix merge conflict with master
refix merge conflict