diff --git a/.gitignore b/.gitignore
index 44b56d8..6432642 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
 node_modules
 .idea
-=======
-results/idObfuscation_salt.php
-backend/getIP_serverLocation.php
->>>>>>> master
+