added cursor case
fixed conflicts
blink test