eliminated conflict in routes
trying to fix the hoodoo
joojoo