working on transactions
fave merchant
fix merge