Fixed the error. App is running again.

The uml files were wrong... There was an error with the merge.