adding support for polyfills
merging