js session connect
Merge conflict resolved