diff --git a/Gemfile.lock b/Gemfile.lock
index f65d6b5b..6b0fd852 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,10 +33,6 @@ DEPENDENCIES
   rack
   rake
   rufus-lru
-<<<<<<< Updated upstream
   tabula-extractor (~> 0.7.2)
-=======
-  tabula-extractor (~> 0.7.2)!
->>>>>>> Stashed changes
   tilt
   warbler