new fixture
fix conflicts