diff --git a/public/react/public/js/codemirror/merge/merge.js b/public/react/public/js/codemirror/merge/merge.js
index 25b44e513..a4337b8c4 100755
--- a/public/react/public/js/codemirror/merge/merge.js
+++ b/public/react/public/js/codemirror/merge/merge.js
@@ -13,7 +13,7 @@
})(function(CodeMirror) {
"use strict";
var Pos = CodeMirror.Pos;
- var svgNS = "http://www.w3.org/2000/svg";
+ var svgNS = "https://www.w3.org/2000/svg";
var value, orig1, orig2, dv, panes = 2, highlight = true, connect = null, collapse = false;
CodeMirror.k_init=function(id,newData,oldData){
diff --git a/public/react/src/history.js b/public/react/src/history.js
index 943008704..fe2ed9e02 100644
--- a/public/react/src/history.js
+++ b/public/react/src/history.js
@@ -1,4 +1,5 @@
-import createHistory from 'history/createBrowserHistory';
+// import createHistory from 'history/createBrowserHistory';
+const createHistory = require('history').createBrowserHistory;
const history = createHistory();
diff --git a/public/react/src/images/shixuns/search.svg b/public/react/src/images/shixuns/search.svg
index cf0e16c0c..3548b7b84 100644
--- a/public/react/src/images/shixuns/search.svg
+++ b/public/react/src/images/shixuns/search.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/react/src/images/tpi/message.svg b/public/react/src/images/tpi/message.svg
index ca544e7ce..2bc508b5c 100644
--- a/public/react/src/images/tpi/message.svg
+++ b/public/react/src/images/tpi/message.svg
@@ -1,6 +1,6 @@
-