diff --git a/.gitignore b/.gitignore
index dffcffd..5ea81bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
 .DS_Store
 /bin
 interface.external.css
+<<<<<<< HEAD
 jquery.js
+=======
+jquery.css
+>>>>>>> 8599ec1841a6f4c5cb99420496684d21f1126c1e
diff --git a/gui/styles/ReadMe.md b/gui/styles/ReadMe.md
index b73dba6..a4d3b62 100644
--- a/gui/styles/ReadMe.md
+++ b/gui/styles/ReadMe.md
@@ -1,5 +1,9 @@
 # External GUI Libraries
 are not included in this repository for the sake of providing authors' credit. Moreover, it's recommended to get the latest versions for as long as they do not break.
 
+<<<<<<< HEAD
 Please choose one; they're exactly the same, but you'll have to rename them as `interface.external.css`.
+=======
+Please choose one; they're exactly the same, but you'll have to rename them as `interface.css`. 
+>>>>>>> 8599ec1841a6f4c5cb99420496684d21f1126c1e
 - [ ] [7.css](https://khang-nd.github.io/7.css/)