Errors with Capybara specs changing the test database remedied
merge conflict resolved