add ctrlp
fix conflict