change the database name to farmsubsidy_development
delete search.rb
rename payment.erb to recipient.erb
search for payments works
merge conflict