add client type for handshake
resolve conflicts