fixed merge conflict

pandas/tests/arrays/sparse/test_array.py

@@ -172,6 +172,7 @@ def test_constructor_inferred_fill_value(self, data, fill_value):
         else:
             assert result == fill_value
 
+    @pytest.mark.parametrize('format', ['coo', 'csc', 'csr'])
     @pytest.mark.parametrize('size', [
         pytest.param(0,
                      marks=pytest.mark.skipif(_np_version_under1p16,