fix conflicts

index.html

@@ -49,6 +49,7 @@
       .Content .content-body {
         font-size: 3.73333vw;
         color: #1e1e1e;
+        word-break: break-all;
       }
     </style>
   </head>