backend form for manufacturer
fixed merge conflict