Update ember.js with 1.3.0 without conflicts