merchant and transaction files created
merchant.rb
add merchant and transaction
resolved conflict in items_test