Merge the app and error modules together