added delete button on image page
resolve merge conflict