diff --git a/.gitignore b/.gitignore
index 5ea81bf..1a3730c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 .DS_Store
 /bin
 interface.external.css
-<<<<<<< HEAD
 jquery.js
-=======
-jquery.css
->>>>>>> 8599ec1841a6f4c5cb99420496684d21f1126c1e
+/config/config.json