delete fixture
resolve conflict