add ultisnips
add you compltete me
fix conflict