update gems
fix merge conflict