pull
added gem set
merge conflicts