updated rspec
conflicts resolved for dusk nov 20