diff --git a/contracts/Claimable.sol b/contracts/Claimable.sol
index c8bc0c6be..279e3480a 100644
--- a/contracts/Claimable.sol
+++ b/contracts/Claimable.sol
@@ -1,10 +1,6 @@
-<<<<<<< HEAD
 pragma solidity ^0.4.0;
 
 
-=======
-pragma solidity ^0.4.4;
->>>>>>> 0aa4d02... DelayedClaimable contract with test added
 import './Ownable.sol';