sever deletion
Merge conflict fix