fix .rspec merge