fix .merge error and upgraded to Ember 1.0