merge, update gems