diff --git a/Gemfile.lock b/Gemfile.lock
index a1ca70b8ec..6f3e432b35 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -241,11 +241,7 @@ GEM
     tilt (2.4.0)
     timeout (0.4.1)
     timers (4.3.5)
-<<<<<<< HEAD
-    tins (1.34.0)
-=======
     tins (1.35.0)
->>>>>>> pr/zinduolis/3162-1
       bigdecimal
       sync
     tzinfo (2.0.6)