fixes merge conflict and gets to new app page