no message

subscriber.json

@@ -62,11 +62,8 @@
     "com.jkfina.tco":"2026 Fina",
     "com.speedydong.vn":"2027 Speedy Dong",
     "com.chobantien.dong":"2028 Cho bạn tiền",
-<<<<<<< HEAD
     "com.kunshan.xiatian":"2031 BumblebeeVay",
-=======
     "com.vn.modong":"2033 MoDong",
->>>>>>> 61419aa1932987e650dbb37100f292a2bab02505
     "com.fast.mypesos": "3001 Filipino Solution深圳乐瀛菲律宾",
     "com.wdjk.mcvay":"3005 Mcash微点金科",
     "ph.fk.cmuedi":"3006 cash-loan上官科技",