Resolve merge conflicts

Author: MarkBaker

phpstan-baseline.neon

@@ -2070,16 +2070,6 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Reader/Ods.php
 
-		-
-			message: "#^Parameter \\#1 \\$settings of method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\:\\:lookForActiveSheet\\(\\) expects DOMElement, DOMElement\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods.php
-
-		-
-			message: "#^Parameter \\#1 \\$settings of method PhpOffice\\\\PhpSpreadsheet\\\\Reader\\\\Ods\\:\\:lookForSelectedCells\\(\\) expects DOMElement, DOMElement\\|null given\\.$#"
-			count: 1
-			path: src/PhpSpreadsheet/Reader/Ods.php
-
 		-
 			message: "#^Cannot use array destructuring on array\\<string\\>\\|string\\.$#"
 			count: 1
@@ -4280,6 +4270,11 @@ parameters:
 			count: 1
 			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
 
+		-
+			message: "#^Cannot use array destructuring on array\\<string\\>\\|string\\.$#"
+			count: 2
+			path: src/PhpSpreadsheet/Worksheet/Worksheet.php
+
 		-
 			message: "#^If condition is always true\\.$#"
 			count: 2

tests/PhpSpreadsheetTests/Calculation/Functions/LookupRef/FilterTest.php

@@ -2,7 +2,6 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\LookupRef;
 
-use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
 use PhpOffice\PhpSpreadsheet\Calculation\Information\ExcelError;
 use PhpOffice\PhpSpreadsheet\Calculation\LookupRef\Filter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;