deletebutton doubleTap fix
solve conflict