diff --git a/README.md b/README.md
index a04a144..263db4b 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 Files for Grenzland-MUD
+=======
+Files for grenzland-mud, forked from tbamud
+
+>>>>>>> e0083e3767413ead07a9ed02c041f25bc7da44ca
 
 Forked from tbamud