diff --git a/contracts/DODOPrivatePool/impl/DPP.sol b/contracts/DODOPrivatePool/impl/DPP.sol
index f9ed963..dd90c9e 100644
--- a/contracts/DODOPrivatePool/impl/DPP.sol
+++ b/contracts/DODOPrivatePool/impl/DPP.sol
@@ -46,13 +46,8 @@ contract DPP is DPPTrader {
     }
 
     // ============ Version Control ============
-<<<<<<< HEAD
 
     function version() external pure returns (string memory) {
         return "DPP 1.0.0";
-=======
-    function version() external pure returns (uint256) {
-        return 1100; // DPP - 1.0.0
->>>>>>> 207593c8ecdc05b481dc2ca6ef474e0fb7055c7b
     }
 }