enable cross origin loading of assets
fix merge