updated conflicts