diff --git a/Million/CommonProperty.cs b/Million/CommonProperty.cs
index 313e10a..302e335 100644
--- a/Million/CommonProperty.cs
+++ b/Million/CommonProperty.cs
@@ -317,11 +317,7 @@ namespace Million
 
         //TODO 추후 관리 방안 고려
         #region # 데이터 베이스 정보 #
-<<<<<<< .mine
-        public const string DbServerIp = " 220.123.49.58";
-=======
         public const string DbServerIp = "220.123.49.58";
->>>>>>> .theirs
         public const string DbServerUserId = "million";
         public const string DbServerUserPassword = "million!";
         public static string DbConnectionStr = $"Data Source={DbServerIp};uid={DbServerUserId};pwd={DbServerUserPassword};Database=";