solve merge conflict
remove model ruby file
add the method total amount to recipient
remove add_pay
met.rb
merge conflict solved