(feat) Fixed merge conflicts on app.js