merge add/edit html