fix merge rspec
fix merge