fix the error of <CR> caused by ultisnips
Merge branch 'ycm'