Client side to server JS connections
Merge conflict fix