fix syntax on style and script in index page
fixed error
fix merge conflicts