I'm attempting to revert this god awful commit that seems to be ruining everything. If this works, things will be back to normal.

Revert "Fixed merge conflict. App should run now."

This reverts commit e151037b8a2b82b7d23dd89f16c3604052dd7b64.