resolved conflict for app.js
resolved conflict for index.html