Update route
Fix comflict