added gems
merge conflict fixed