fixed conflict in rspec