Changed keys and vimrc
Resolved conflicts