added routing to dynamic template
fixed merges
fixed conflict