Changing to ember a Backbone
Conflict resolved