Fix for conflict in tests/test_format.py