I forgot to clear all of the conflicting indicators

readme.md

@@ -18,7 +18,6 @@ Change the permission for mounted config and save files.
 chmod -R 777 ./MyDediServer
 ~~~~
 
-<<<<<<< Updated upstream
 You can pull this script from docker hub: `catoverflow/dst-server`, or build yourself:
 
 > Change the arguments according to your settings. Base location is by default set to `/home/steam` in steamcmd.
@@ -53,4 +52,4 @@ docker exec -it dst-dedicated "tmux attach -t DST-dedicated"
 ## Known Issues
 
 - Mapping different ports for cave server will make it unusable. Once you enter the cave you will be locked out, as the master server keeps redirecting you to inaccessible cave server port outside the container.
-- If offline mode or LAN only option is on, only ports within range [10998, 11018] can be used. This is DST feature :）
+- If offline mode or LAN only option is on, only ports within range [10998, 11018] can be used. This is DST feature :）