routes changes
fixed routes conflict