fix routes for conflict