add ctrlp.vim and some map
solve conflict