OJK UI merge