user backbone
merge conflict resolution in router.js
mmm