updated code
Conflict resolved