update gems
fixing bad merge