switch from Jeweler to Bundler
resolved merge conflicts