diff --git a/config/config.go b/config/config.go
index bdef266..1c86472 100644
--- a/config/config.go
+++ b/config/config.go
@@ -32,7 +32,7 @@ type log struct {
 	Compress       bool   // 是否压缩日志
 	Stdout         bool   // 是否输出到控制台
 }
-<<<<<<< HEAD
+
 type messaging struct {
 	Centrifugo centrifugo
 }
@@ -41,11 +41,10 @@ type centrifugo struct {
 	ApiKey      string
 	ApiEndpoint string
 	Address     string
-=======
+}
 type dynamics struct {
 	UdpLocalPort  int
 	UdpRemoteAddr string
->>>>>>> a435ec7520b6fab654c7e0b9ece87920ee534ba9
 }
 
 var Config AppConfig