update latest backbonejs
merge conflict