done with tcp wrapper
fixed merge conflict