diff --git a/.gitignore b/.gitignore
index 1285bafd..3fdddcab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -106,13 +106,13 @@ dist
 
 # Custom
 .idea
-<<<<<<< HEAD
 
 # Ephemeral Account
 tests/testAccount/ephemeralAccount.json
 
 # Documentation
 docs/
-=======
 .gitsigners
->>>>>>> 1108692 (add .gitsigners to .gitignore, containing some signing key)
+
+
+.DS_Store
\ No newline at end of file