Resolve conflict in merge

Author: patkyn

Diff for: .github/workflows/publish-release.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Python 3.10
+      - name: Set up Python 3.9
         uses: actions/setup-python@v5
         with:
           python-version: "3.9"

Diff for: LICENSE

@@ -466,4 +466,4 @@ EXHIBIT A -Mozilla Public License.
      [NOTE: The text of this Exhibit A may differ slightly from the text of
      the notices in the Source Code files of the Original Code. You should
      use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
+     Original Code Source Code for Your Modifications.]

Diff for: README.md

@@ -99,7 +99,7 @@ DwcaHandler.create_dwca(core_csv=core_frame, ext_csv_list=ext_frame, eml_content
 ```python
 from dwcahandler import DwcaHandler
 
-DwcaHandler.merge_dwca(dwca_file='/tmp/dwca.zip', delta_dwca_file=/tmp/delta-dwca.zip,
+DwcaHandler.merge_dwca(dwca_file='/tmp/dwca.zip', delta_dwca_file='/tmp/delta-dwca.zip',
                        output_dwca_path='/tmp/new-dwca.zip', 
                        keys_lookup={'occurrence':'occurrenceID'})
 ```
@@ -147,4 +147,4 @@ dwca._generate_eml()
 dwca._generate_meta()
 dwca._write_dwca('/tmp/newdwca.zip')
 
-```
+```