add history.js
fix CONFLICT