diff --cc core/src/timetask.json
index 0eba9db,8be7bc9..0000000
--- a/core/src/timetask.json
+++ b/core/src/timetask.json
@@@ -1,1 -1,1 +1,5 @@@
- {"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-28 09:39:35"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-28 09:39:35"}},"marketisstart":true,"marketrate":300}
 -{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-28 12:54:36"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-28 12:54:36"}},"marketisstart":true,"marketrate":300}
++<<<<<<< HEAD
++{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-28 09:39:35"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-28 09:39:35"}},"marketisstart":true,"marketrate":300}
++=======
++{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-28 12:54:36"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-28 12:54:36"}},"marketisstart":true,"marketrate":300}
++>>>>>>> e697f24fdd22cbe16dc2ce282d2d1689a6e445a7
diff --git a/common/src/qfw/util/sq/sq.go b/common/src/qfw/util/sq/sq.go
index 96ac697..11e2d32 100644
--- a/common/src/qfw/util/sq/sq.go
+++ b/common/src/qfw/util/sq/sq.go
@@ -13,7 +13,7 @@ import (
 const key string = "qmx20150708one_versionV1.0"
 
 func init() {
-	CheckSq()
+	//CheckSq()
 }
 
 func CheckSq() bool {