diff --git a/lib/layout.js b/lib/layout.js
index 75470c16..dfccf301 100644
--- a/lib/layout.js
+++ b/lib/layout.js
@@ -17,7 +17,6 @@ let Graph = require("@dagrejs/graphlib").Graph;
 module.exports = layout;
 
 function layout(g, opts) {
-<<<<<<< HEAD
   let time = opts && opts.debugTiming ? util.time : util.notime;
   time("layout", () => {
     let layoutGraph =