fixed merge errors, slugs working, app working