diff --git a/Gemfile.lock b/Gemfile.lock
index 75035b78d269be03c6c4fe9f976243d541bde854..d85d58665eccb63be9445b8142567f993b181461 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -330,11 +330,7 @@ GEM
     simple_form_bs5_file_input (0.0.3)
       rails
       simple_form
-<<<<<<< HEAD
     simple_form_password_with_hints (0.0.4)
-=======
-    simple_form_password_with_hints (0.0.3)
->>>>>>> 353f910894520e230e8ba00dd407158a1901b980
       rails
       simple_form
     sinatra (2.1.0)