work on the routes file comflict