OJK /server/ merge