update fix conflict ycm with utilsnip