fixed routes conflict, think I'm all done w conflicts. Sorry y'all