Update edit.ctp

manual merge