Specify Ruby, bundler & rake versions
bundle install
Fix merge