Rename dot to _dot to avoid name collisions
Add nelstrom/vim-visual-star-search vim bundle
Use diff3 conflictstyle