previous commit fixed the hovering delete button bug
fixed small bug
trying to commit
Merged conflicts