add configurable pretty print for client message sending
conflict resolve