conflicts (again)