merge, fixed on_clnt_open