diff --git a/.gitignore b/.gitignore
index 2f422a7..17507ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
 .env
-<<<<<<< HEAD
 bin/*
-=======
-bin
->>>>>>> 454207d6ae18703f0d99f4d901a2d46c6d7164df
 s3-client*
\ No newline at end of file