OJK /client/ merge