DONE!
Merge
Merge
new history and result page. update some codes, string