fix for RT#75486: instead of silently ignoring conflicts that do not com...

...pile, issue a conflict warning