A tiny bit of rspec and merging