Update merchant tests
Fix merge conflict