fixed merge

fixed routes file and merged!