fix .merge error and upgrade to Ember 1.0