changed cursor type in insert mode
fixed merge conflict