working on edit merchant form
pulling in product form
fixed merge