Changed router for backbone
fixed merge conflict