C++: less verbose error-recovery for version conflict markers