update index-main.js
fix conflicts