merged rspec