cursor style update
merge resolve