try to pull
fixed merge conflict
close socket if the client does not require persistent connection