diff --git a/.github/workflows/linting_comment.yml b/.github/workflows/linting_comment.yml
index 0bbcd30f23effefe9ac5a7a49cc16f43140c20a7..564a8d3661c34b5f06683bdeee0eba4f2c34cf96 100644
--- a/.github/workflows/linting_comment.yml
+++ b/.github/workflows/linting_comment.yml
@@ -25,4 +25,4 @@ jobs:
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           number: ${{ steps.pr_number.outputs.pr_number }}
-          path: linting-logs/lint_results.md
+          path: linting-logs/lint_results.md
\ No newline at end of file
diff --git a/modules.json b/modules.json
index d7443e6bb4a6189effd0c714a08fcbc4dcd6c291..e2a9c3ce6a7717632c5c0ec5d64b8e6fc9213ea1 100644
--- a/modules.json
+++ b/modules.json
@@ -74,6 +74,13 @@
                         "installed_by": [
                             "modules"
                         ]
+                    },
+                    "multiqc": {
+                        "branch": "master",
+                        "git_sha": "c8e35eb2055c099720a75538d1b8adb3fb5a464c",
+                        "installed_by": [
+                            "modules"
+                        ]
                     }
                 }
             },
diff --git a/modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py b/modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py
index a06f32b4aaa481be00f5f9b10fa44c4d2d16be9e..b83b32c4d4242764a439f4d51e0255711f9cd40f 100755
--- a/modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py
+++ b/modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py
@@ -3,19 +3,11 @@
 
 """Provide functions to merge multiple versions.yml files."""
 
-
-<<<<<<< HEAD
-import yaml
-import platform
-from textwrap import dedent
-
-=======
 import platform
 from textwrap import dedent
 
 import yaml
 
->>>>>>> c5796cd967b920b736acba2ee60128d6ac0338db
 
 def _make_versions_html(versions):
     """Generate a tabular HTML output of all versions for MultiQC."""