add passing test for DELETE ProspectCard
fix merge conflict in user.rb and sessions controller