Fix the routes file , this should be removed on resolving conflicts