added visual-line-mode on by default
merge conflict