diff --git a/package.json b/package.json
index 72aadb43937..09fadfc7097 100644
--- a/package.json
+++ b/package.json
@@ -85,11 +85,7 @@
     "solhint": "^3.3.6",
     "solidity-ast": "^0.4.25",
     "solidity-coverage": "^0.8.0",
-<<<<<<< HEAD
     "solidity-docgen": "^0.6.0-beta.29",
-=======
-    "solidity-docgen": "^0.5.3",
->>>>>>> 7df44c40 (Update dependency solidity-coverage to ^0.8.0 (#3681))
     "web3": "^1.3.0",
     "yargs": "^17.0.0"
   }