update icon and timing mech
resolve conflicts