resolve rebase conflicts

Author: H4ad

lib/internal/modules/cjs/loader.js

@@ -1065,7 +1065,11 @@ Module._load = function(request, parent, isMain) {
  // to determine if it's loading or not.
  const importedCJSMetadata = importedCJSCache.get(cachedModule);
  if (importedCJSMetadata.loading) {
- return getExportsForCircularRequire(cachedModule);
+ const result = getExportsForCircularRequire(cachedModule);
+
+ endTimer(logLabel, traceLabel);
+
+ return result;
  }
  importedCJSMetadata.loading = true;
  } else {