Yup, merchant is broken. Fixing.
There's still some bugs related to escaping but they aren't easy to reproduce.