diff --git a/Berksfile.lock b/Berksfile.lock
index 6d3c5fe..bc3d782 100644
--- a/Berksfile.lock
+++ b/Berksfile.lock
@@ -114,11 +114,7 @@ GRAPH
   hostsfile (2.4.5)
   iis (6.7.1)
     windows (>= 2.0)
-<<<<<<< HEAD
   ipfs (0.1.2)
-=======
-  ipfs (0.1.1)
->>>>>>> 591c746... Update the ipfs cookbook
     ark (>= 0.0.0)
   logrotate (2.2.0)
   mariadb (0.3.1)