basic server/ client code
resolved conflicts