resolved frontenddev conflicts for edit_pad view