Fix merge error

THIS IS NOW CLIENT-CONNECTION! SORRY!
Signed-off-by: Jack Huey kitskub@gmail.com