diff --git a/config/base_setting.py b/config/base_setting.py
index aaa975d..cae7190 100644
--- a/config/base_setting.py
+++ b/config/base_setting.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-SERVER_PORT = 8999
+SERVER_PORT = 8998
 DEBUG = False
 SQLALCHEMY_ECHO = False
 
@@ -44,13 +44,7 @@ UPLOAD = {
 
 APP = {
     # 'domain':'http://106.52.204.179:8999'
-<<<<<<< HEAD
        'domain':'https://python815.cn'
-=======
-
-
->>>>>>> 86554b9ce9fff07f8fcb5b67a271976c08d3b684
-
 }
 
 PAY_STATUS_MAPPING = {