fix conflicts field

No match.