Cpp: Detect the other two conflict markers too.