fix routes
fix merge