edit view half way working
fixed merge conflict on edit view