Fixing broken project state. Issues with conflicts and namespace references resolved, such that lein ring server starts up without error now