added ycm stuff
resolved merge conflicts