Updated conflicts