fixing merge errors AGAIN. rspec 1st people