adding edit form view
resolved conflicts