merge views new and edit