minor updates to app.
fixed merge conflict.