category edit view added
pull conflict resolved