diff --git a/Server/Settings.py b/Server/Settings.py
index 4d1dac3..0bfe478 100644
--- a/Server/Settings.py
+++ b/Server/Settings.py
@@ -47,4 +47,8 @@ public = True
 ServerIP = "localhost"
 #ServerPort = server_port[1]
 ServerPort = 6980
-ThaiSDRkey = ""
\ No newline at end of file
+<<<<<<< HEAD
+ThaiSDRkey = ""
+=======
+ThaiSDRkey = ""
+>>>>>>> 53163be3dc12010715271f6020a0c07d2af720ec