adding backbone and underscore
fixing merge conflict