updated faker-stoked
fixed merge conflict
fixed diff in Gemfile.lock