Only show conflict markers when more than 3 <
Add remaps to vim and aliases to zsh