add comments
resolve app.js conflict