solve safety delete problem
fix conflict (delete)