Fixed bug with wrong substitution parameters and simplified warning for conflicts.
Fixed bug with wrong substitution parameters and simplified warning for conflicts.


apache/xalan-c,apache/xalan-c,apache/xalan-c,apache/xalan-c