update gems
merge