update to latest ruby and gems
update gems
fix merge conflicts