fix conflicts field