add changes to app js
correct merge conflict