final changes
final changes
resolved merge conflict with app.js