update ctrlp
update .vimrc
solve conflict
fixed error