fixed double deletion bug
merge