Failed attempt at fixing merchant_selection
Resolved changes with remote?