added delete buttton
fixed merge conflict