Remapped <> to retain selection
Fixed .vimrc merge conflicts