diff --git a/README.md b/README.md
index 4e3dfe5..f7fbf7d 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,11 @@
-To switch user use: > su minecraft -s /bin/bash
+To switch user use: su minecraft -s /bin/bash
 
 # To DO
 - [ ] 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
+