merge conflict
update gems
fix merge conflict