Updated gems
updated gems
fixed merge conflicts