sanity check on cursor move
merge conflict