Escaped out of Peter's merge conflicts alive

and added delete button functionality