Set up Backbone
Fix merge conflicts