Session management done
Conflict resolved