resolved merge conflicts

Author: crperezt

dev-reactime/index.js

@@ -3,7 +3,7 @@
  * @function linkFiber
  */
 import 'core-js';
-// import 'regenerator-runtime/runtime';
+import 'regenerator-runtime/runtime';
 import linkFiberStart from './linkFiber';
 import timeJumpStart from './timeJump';