diff --git a/Gemfile.lock b/Gemfile.lock
index 328f1d048..c4c8d9904 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -240,11 +240,7 @@ GEM
       ruby-progressbar (~> 1.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-<<<<<<< HEAD
-    hamlit (2.11.0)
-=======
     hamlit (2.13.0)
->>>>>>> v3.3.0
       temple (>= 0.8.2)
       thor
       tilt