fixed routing issue
fixed merge