Fixed UI merge issue