diff --git a/README.md b/README.md
index 4b60c8d..4e3dfe5 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,11 @@ To switch user use: > su minecraft -s /bin/bash
 - [ ] Basic commands
 - [x] server.properties + run.sh + eula.txt 
 - [ ] iptable commands
+<<<<<<< HEAD
 - [!] my own .service file
+=======
+- [t] my own .service file
+- [x] modification of run.sh
+>>>>>>> cb44b12a874d0f44e6182d1759d65b8da1cc563c
 - [ ] screen usege
 - [ ] SSH keys