diff --git a/index.html b/index.html
index 3500531..e1ae2ca 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,5 @@
-<<<<<<< HEAD
-
-
-
-
Projects
-
-
-
-
-
-
Open-source Minecraft server API wrapper written in Node.js.
-
GitHub
-
Website
-
-
-
-
-
-
-
-
Computer repair & refurbishing on Mayne Island.
-
Website
-
-
-
-
-
-
-
-
Java plugins for Minecraft Spigot servers.
-
Forums
-
-
-
-
-
-
-
Side Projects
-
-
-
-
Minecraft Banner Generator
-
Generates live server banners.
-
GitHub
-
-
-
-
-
scripts
-
Linux scripts for various things.
-
GitHub
-
-
-
-
-
-
-
-
->>>>>>> 2c1897fd06c2650cc559ee49636ae38cef0d10d5
+
\ No newline at end of file