Fix merge conflicts rspec

resolved merge conflicts. can to be added to master.