diff --git a/.gitignore b/.gitignore
index 4edc71b73..a2bf90c36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
 .onion
 vendor
-=======
-Gemfile.lock
-vendor/bundle
->>>>>>> b55183f... Added tf as test suite for bash sripts
+composer.lock