setup with routes
will this fix a merge conflict?