fix gemfile
merge master