Added type to script tags
Fix lack of source map
Fixed merge