add history list
fix CONFLICT in web/index.html