diff --git a/.gitignore b/.gitignore
index 4611369..916a671 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,6 +63,10 @@ lib/plrobjs/index
 !lib/plrobjs/U-Z/00
 !lib/plrobjs/ZZZ/00
 
+#don't commit logs
+!log/*
+!syslog.CRASH
+
 # also not autogenerated config file
 /lib/etc/config
 # or the list of last logins
diff --git a/README.md b/README.md
deleted file mode 100644
index 263db4b..0000000
--- a/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-<<<<<<< HEAD
-Files for Grenzland-MUD
-=======
-Files for grenzland-mud, forked from tbamud
-
->>>>>>> e0083e3767413ead07a9ed02c041f25bc7da44ca
-
-Forked from tbamud