Fixed merge conflict. App should run now.