fixed index, fixed nick.js
fixed merge issue in nick.js