Added SessionId
Resolved conflicts