updated the app
fixed merge conflicts