Conflicts:
	build/asset-manifest.json
	build/index.html
	build/mrstatic/css/36.aebbab68.chunk.css
	build/mrstatic/css/37.50547718.chunk.css
	build/mrstatic/css/37.6e3cdb13.chunk.css
	build/mrstatic/css/37.aebbab68.chunk.css
	build/mrstatic/css/37.aebbab68.chunk.css.map
	build/mrstatic/css/38.2471f477.chunk.css
	build/mrstatic/css/38.2833f269.chunk.css
	build/mrstatic/css/38.50547718.chunk.css
	build/mrstatic/css/38.50547718.chunk.css.map
	build/mrstatic/css/39.0bb224f2.chunk.css
	build/mrstatic/css/39.2471f477.chunk.css
	build/mrstatic/css/39.2471f477.chunk.css.map
	build/mrstatic/css/39.6b450e29.chunk.css
	build/mrstatic/css/40.0a40f258.chunk.css
	build/mrstatic/css/40.0bb224f2.chunk.css
	build/mrstatic/css/40.0bb224f2.chunk.css.map
	build/mrstatic/css/40.ecbb6f9a.chunk.css
	build/mrstatic/css/41.18c88f1f.chunk.css
	build/mrstatic/css/41.44620a41.chunk.css
	build/mrstatic/css/41.ecbb6f9a.chunk.css
	build/mrstatic/css/41.ecbb6f9a.chunk.css.map
	build/mrstatic/css/42.07af17e7.chunk.css
	build/mrstatic/css/42.18c88f1f.chunk.css
	build/mrstatic/css/42.18c88f1f.chunk.css.map
	build/mrstatic/css/43.eb90513f.chunk.css.map
	build/mrstatic/css/blessing-getPrize.57758140.chunk.css
	build/mrstatic/css/blessing-preheat.6e9d9dac.chunk.css
	build/mrstatic/js/0.302e54ec.chunk.js
	build/mrstatic/js/0.b845d6cf.chunk.js
	build/mrstatic/js/1.6c7d23fc.chunk.js
	build/mrstatic/js/1.6c7d23fc.chunk.js.map
	build/mrstatic/js/1.f577d128.chunk.js.map
	build/mrstatic/js/2.4d3b6bb4.chunk.js
	build/mrstatic/js/2.a75153cd.chunk.js
	build/mrstatic/js/2.a9f978ac.chunk.js
	build/mrstatic/js/38.370e9886.chunk.js
	build/mrstatic/js/38.370e9886.chunk.js.map
	build/mrstatic/js/38.3abb6bff.chunk.js
	build/mrstatic/js/38.3abb6bff.chunk.js.map
	build/mrstatic/js/38.5791d700.chunk.js
	build/mrstatic/js/38.5791d700.chunk.js.map
	build/mrstatic/js/39.18590c4c.chunk.js
	build/mrstatic/js/39.78c9803f.chunk.js
	build/mrstatic/js/39.78c9803f.chunk.js.map
	build/mrstatic/js/39.8387daa8.chunk.js
	build/mrstatic/js/39.8387daa8.chunk.js.map
	build/mrstatic/js/40.5d966c8e.chunk.js
	build/mrstatic/js/40.94e137c5.chunk.js
	build/mrstatic/js/40.ea26256d.chunk.js
	build/mrstatic/js/41.1588e165.chunk.js
	build/mrstatic/js/41.85e16305.chunk.js
	build/mrstatic/js/42.3f1306bc.chunk.js
	build/mrstatic/js/42.3f1306bc.chunk.js.map
	build/mrstatic/js/42.fa1a0064.chunk.js
	build/mrstatic/js/42.fa1a0064.chunk.js.map
	build/mrstatic/js/Activity.4ffe549d.chunk.js.map
	build/mrstatic/js/Activity.da6bbbd2.chunk.js.map
	build/mrstatic/js/BargainMiddlePage.222a37d6.chunk.js.map
	build/mrstatic/js/BargainMiddlePage.7bc59d0c.chunk.js.map
	build/mrstatic/js/Classify.403f5746.chunk.js.map
	build/mrstatic/js/Classify.867735ac.chunk.js.map
	build/mrstatic/js/Country.13e44b90.chunk.js.map
	build/mrstatic/js/Country.41b431da.chunk.js.map
	build/mrstatic/js/CourseList.4101bda2.chunk.js
	build/mrstatic/js/CourseList.4101bda2.chunk.js.map
	build/mrstatic/js/CourseList.75f9c7b0.chunk.js
	build/mrstatic/js/CourseList.75f9c7b0.chunk.js.map
	build/mrstatic/js/DrawDocument.108294ef.chunk.js.map
	build/mrstatic/js/DrawDocument.739d08a4.chunk.js.map
	build/mrstatic/js/Invite.a01280f1.chunk.js.map
	build/mrstatic/js/MyEdit.5137f9e7.chunk.js
	build/mrstatic/js/MyEdit.5137f9e7.chunk.js.map
	build/mrstatic/js/MyEdit.9dda32f5.chunk.js
	build/mrstatic/js/MyEdit.9dda32f5.chunk.js.map
	build/mrstatic/js/Order.5b4ab760.chunk.js.map
	build/mrstatic/js/Order.9d06dcff.chunk.js.map
	build/mrstatic/js/Orderinfo.2906f519.chunk.js
	build/mrstatic/js/Orderinfo.2906f519.chunk.js.map
	build/mrstatic/js/Orderinfo.bdc357fe.chunk.js
	build/mrstatic/js/Orderinfo.bdc357fe.chunk.js.map
	build/mrstatic/js/Orderinfo.dfa49737.chunk.js
	build/mrstatic/js/PayOrder.6091de26.chunk.js.map
	build/mrstatic/js/PayOrder.f09c24ca.chunk.js.map
	build/mrstatic/js/Preferential.c3c95e5a.chunk.js
	build/mrstatic/js/Preferential.c3c95e5a.chunk.js.map
	build/mrstatic/js/Preferential.f2754036.chunk.js
	build/mrstatic/js/Preferential.f2754036.chunk.js.map
	build/mrstatic/js/SearchResult.0e236b47.chunk.js
	build/mrstatic/js/SearchResult.c33ce015.chunk.js
	build/mrstatic/js/ShareCourse.5ec989b2.chunk.js
	build/mrstatic/js/ShareCourse.5ec989b2.chunk.js.map
	build/mrstatic/js/ShareCourse.71679baa.chunk.js
	build/mrstatic/js/ShareCourse.71679baa.chunk.js.map
	build/mrstatic/js/ShareCourse.db0dc0f6.chunk.js
	build/mrstatic/js/ShopCart.007782a4.chunk.js
	build/mrstatic/js/ShopCart.007782a4.chunk.js.map
	build/mrstatic/js/ShopCart.9cbc88cd.chunk.js
	build/mrstatic/js/ShopCart.9cbc88cd.chunk.js.map
	build/mrstatic/js/aist-share.1afdcdd8.chunk.js
	build/mrstatic/js/aist-share.1afdcdd8.chunk.js.map
	build/mrstatic/js/aist-share.4ad1de1e.chunk.js
	build/mrstatic/js/aist-share.4ad1de1e.chunk.js.map
	build/mrstatic/js/aist-share.e6b106cb.chunk.js
	build/mrstatic/js/blessing-getPrize.7aa4d711.chunk.js
	build/mrstatic/js/blessing-rank.bee5d18f.chunk.js.map
	build/mrstatic/js/coupons.0da4bf8b.chunk.js
	build/mrstatic/js/coupons.0da4bf8b.chunk.js.map
	build/mrstatic/js/coupons.16f844aa.chunk.js
	build/mrstatic/js/coupons.16f844aa.chunk.js.map
	build/mrstatic/js/deposit-order.05f70bab.chunk.js
	build/mrstatic/js/deposit-order.05f70bab.chunk.js.map
	build/mrstatic/js/deposit-order.37518824.chunk.js
	build/mrstatic/js/deposit-order.37518824.chunk.js.map
	build/mrstatic/js/deposit-order.7140f2f8.chunk.js
	build/mrstatic/js/deposit-pay-order.581a33c4.chunk.js.map
	build/mrstatic/js/deposit-pay-order.9edc9f03.chunk.js.map
	build/mrstatic/js/detail.a9e721c3.chunk.js.map
	build/mrstatic/js/detail.e1043ecb.chunk.js.map
	build/mrstatic/js/main.af0a0c2d.chunk.js.map
	build/mrstatic/js/myorders.1749cfb1.chunk.js
	build/mrstatic/js/myorders.1749cfb1.chunk.js.map
	build/mrstatic/js/myorders.534ad528.chunk.js
	build/mrstatic/js/myorders.ce8733b3.chunk.js
	build/mrstatic/js/myorders.ce8733b3.chunk.js.map
	build/mrstatic/js/prize-winner-list.745e8d43.chunk.js
	build/mrstatic/js/prize-winner-list.a12c08ad.chunk.js
	build/mrstatic/js/purchased.2f92d794.chunk.js
	build/mrstatic/js/purchased.2f92d794.chunk.js.map
	build/mrstatic/js/purchased.6ee9010b.chunk.js
	build/mrstatic/js/purchased.6ee9010b.chunk.js.map
	build/mrstatic/js/search.15481409.chunk.js
	build/mrstatic/js/search.15481409.chunk.js.map
	build/mrstatic/js/search.bfac27c7.chunk.js
	build/mrstatic/js/search.bfac27c7.chunk.js.map
	build/mrstatic/js/shareposter.3027332f.chunk.js
	build/mrstatic/js/shareposter.3027332f.chunk.js.map
	build/mrstatic/js/shareposter.8dfa7a7e.chunk.js
	build/mrstatic/js/shareposter.8dfa7a7e.chunk.js.map
	build/mrstatic/js/togroup.2e659cf9.chunk.js
	build/mrstatic/js/togroup.6f025f11.chunk.js
	build/mrstatic/js/togroup.6f025f11.chunk.js.map
	build/mrstatic/js/togroup.763fadb3.chunk.js
	build/mrstatic/js/togroup.763fadb3.chunk.js.map
	build/mrstatic/js/video.35d1c097.chunk.js.map
	build/mrstatic/js/video.3dfcab2b.chunk.js.map
	build/service-worker.js