tweaking vimrc, mapping for caps-lock to esc and <leader><space> to :noh
Solved merge-conflicts