Fix merge conflicts
add require, backbone & underscore