Meteor upate
Fixed merge conflict