Delete button working, logic needs to be finished
Merge error