Upgrade ember and resolver