add client
fix confict 2