resolve code conflict

@@ -28,15 +28,7 @@
         a.async=1;
         a.src=j;
         m.parentNode.insertBefore(a,m);
-<<<<<<< HEAD
-<<<<<<< HEAD
-    })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13.2/yas.js','_yas');
-=======
     })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/{{yas_version}}/yas.js','_yas');
->>>>>>> 3685878e28b5f0a7fbf2ebdb250a96a5ecc47f52
-=======
-    })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13.2/yas.js','_yas');
->>>>>>> 70676b75c6237c141c6f2f4e47518bcd80ea47d8
 </script>
 {{> layout/use}}
 {{> layout/analysis}}