Added Before Delete Method
Confict resolution