Update app2.js

fixing merge conflicts