For all filetype's highlight conflict markers with the Todo highlight group and leave trailing text as before. This makes conflict markers very obvious, in C/C++ where I have operator highlighting conflict markers are not longer highlighted as operators.