diff --git a/lib/index.js b/lib/index.js
index 3f5acad..29b196b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -1,11 +1,7 @@
 'use strict';
 
-<<<<<<< HEAD
-const debug = require('debug')('metalsmith-metameta');
-=======
 // eslint-disable-next-line no-unused-vars
 const debug = require('debug')('@metalsmith/metadata');
->>>>>>> 87ad5ff9f9bb56fb5f728cdf898f1ec6ec05fe3e
 const {
   promises: { readFile, readdir }
 } = require('fs');
@@ -103,15 +99,7 @@ function toJson(file, ext) {
   switch (ext) {
     case '.yaml':
     case '.yml':
-<<<<<<< HEAD
-      try {
-        fileContent = yamlToJSON(file);
-      } catch(e) {
-        debug(e);
-      }
-=======
       fileContent = yamlToJS(fileBuffer);
->>>>>>> 87ad5ff9f9bb56fb5f728cdf898f1ec6ec05fe3e
       break;
     case '.toml':
       try { // remove object prototype
@@ -207,12 +195,7 @@ async function getDirectoryObject(directoryPath, optionKey, allMetadata) {
       }
     })
     .catch((e) => {
-<<<<<<< HEAD
       debug(e);
-=======
-      // eslint-disable-next-line no-undef
-      done(e.message);
->>>>>>> 87ad5ff9f9bb56fb5f728cdf898f1ec6ec05fe3e
     });
 }