conflict data structure update