Update conflict tests.