Fix merge error

Signed-off-by: Jack Huey kitskub@gmail.com
Merge pull request #634 from kitskub/client-connection

Fix merge error