Added rspec rails gem
Ran rails g rspec:install
Resolve merge conflicts.