slide edition and deletion #5
fix conflict