Feature/merchants