UI merge fix