working on delete button
Fix merge problems