changes to app for testing, reconfigured ID constraints to objects.
Fixed merge conflict in app.