diff --git a/Gemfile.lock b/Gemfile.lock
index 74bca9c..0ae80bc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -39,14 +39,10 @@ GEM
     rubypython (0.5.1)
       blankslate (>= 2.1.2.3)
       ffi (~> 1.0.7)
-<<<<<<< HEAD
-    sass (3.1.7)
-=======
     sass (3.1.5)
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
->>>>>>> 423e8ecbda0394d4c77e2ea659768a8f30c35018
     stringex (1.3.0)
     syntax (1.0.0)
     tilt (1.3.2)