refactor(conflicts): resolving merge issues

es/index.js

@@ -1,11 +1,14 @@
 /* global window */
 import ponyfill from './ponyfill';
 
-let root = this;
+var root = this;
 if (typeof global !== 'undefined') {
 	root = global;
 } else if (typeof window !== 'undefined') {
 	root = window;
 }
 
-export default ponyfill(root);
+var result = ponyfill(root);
+// being explicit
+result['default'] = result;
+export default result;

package.json

@@ -12,9 +12,8 @@
     "node": ">=0.10.0"
   },
   "scripts": {
-    "test": "mocha && tsc ./ts-test/test.ts && node ./ts-test/test.js"
+    "test": "npm run build && mocha && tsc ./ts-test/test.ts && node ./ts-test/test.js",
     "build": "babel es --out-dir lib",
-    "test": "npm run build && mocha",
     "prepublish": "npm test"
   },
   "files": [