fixed dynamic routing
Fixed merge issues