Fixed rspec install with capybara and rake db:migrate RAILS_ENV=test
fix merge issue