configure ycm
merge