fix routing
merge