fix route
fix merge conflict