resolve conflicts

about top-dot component