vote rspec
resolved merge conflict