Updated the conflict data structure