Fix contrib/stg-whatchanged way of identifying a conflict.