ISafeERC20 removed

contracts/mocks/SafeERC20Helper.sol

@@ -1,9 +1,9 @@
 pragma solidity ^0.4.24;
 
-import "../token/ERC20/ISafeERC20.sol";
+import "../token/ERC20/IERC20.sol";
 import "../token/ERC20/SafeERC20.sol";
 
-contract ERC20FailingMock is ISafeERC20 {
+contract ERC20FailingMock is IERC20 {
   uint256 private _allowance;
   function totalSupply() public view returns (uint256) {
     return 0;
@@ -42,7 +42,7 @@ contract ERC20FailingMock is ISafeERC20 {
   }
 }
 
-contract ERC20SucceedingMock is ISafeERC20 {
+contract ERC20SucceedingMock is IERC20 {
   uint256 private _allowance;
 
   function totalSupply() public view returns (uint256) {
@@ -83,17 +83,11 @@ contract ERC20SucceedingMock is ISafeERC20 {
 }
 
 contract SafeERC20Helper {
-<<<<<<< b40c76d0b1e2fc356c63a01d0d6eb1abd0196a73
-    using SafeERC20 for IERC20;
 
-    IERC20 private _failing;
-    IERC20 private _succeeding;
-=======
-  using SafeERC20 for ISafeERC20;
+  using SafeERC20 for IERC20;
 
-  ISafeERC20 private _failing;
-  ISafeERC20 private _succeeding;
->>>>>>> suggested changes done
+  IERC20 private _failing;
+  IERC20 private _succeeding;
 
     constructor () public {
         _failing = IERC20(new ERC20FailingMock());

contracts/token/ERC20/IERC20.sol

@@ -17,6 +17,15 @@ interface IERC20 {
 
     function transferFrom(address from, address to, uint256 value) external returns (bool);
 
+  function increaseAllowance(address spender, uint256 addedValue) 
+    external returns (bool);
+
+  function decreaseAllowance(address spender, uint256 subtractedValue) 
+    external returns (bool);
+
+  function setAllowance(uint256 value) 
+    external returns (bool);
+
   event Transfer(
     address indexed from,
     address indexed to,

contracts/token/ERC20/ISafeERC20.sol

@@ -1,43 +0,0 @@
-pragma solidity ^0.4.24;
-
-/**
- * @title SafeERC20 interface
- * @dev ERC20 operations with allowance operations. For ERC20, see https://github.com/ethereum/EIPs/issues/20
- */
-interface ISafeERC20 {
-  function totalSupply() external view returns (uint256);
-
-  function balanceOf(address who) external view returns (uint256);
-
-  function allowance(address owner, address spender)
-    external view returns (uint256);
-
-  function transfer(address to, uint256 value) external returns (bool);
-
-  function approve(address spender, uint256 value)
-    external returns (bool);
-
-  function transferFrom(address from, address to, uint256 value)
-    external returns (bool);
-
-  function increaseAllowance(address spender, uint256 addedValue) 
-    external returns (bool);
-
-  function decreaseAllowance(address spender, uint256 subtractedValue) 
-    external returns (bool);
-
-  function setAllowance(uint256 value) 
-    external returns (bool);
-
-  event Transfer(
-    address indexed from,
-    address indexed to,
-    uint256 value
-  );
-
-  event Approval(
-    address indexed owner,
-    address indexed spender,
-    uint256 value
-  );
-}

contracts/token/ERC20/SafeERC20.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.24;
 
 import "./ERC20.sol";
-import "./ISafeERC20.sol";
+import "./IERC20.sol";
 
 /**
  * @title SafeERC20
@@ -11,7 +11,7 @@ import "./ISafeERC20.sol";
  */
 library SafeERC20 {
   function safeTransfer(
-    ISafeERC20 token,
+    IERC20 token,
     address to,
     uint256 value
   )
@@ -21,7 +21,7 @@ library SafeERC20 {
   }
 
   function safeTransferFrom(
-    ISafeERC20 token,
+    IERC20 token,
     address from,
     address to,
     uint256 value
@@ -32,7 +32,7 @@ library SafeERC20 {
   }
 
   function safeApprove(
-    ISafeERC20 token,
+    IERC20 token,
     address spender,
     uint256 value
   )
@@ -46,7 +46,7 @@ library SafeERC20 {
   }
 
   function safeIncreaseAllowance(
-    ISafeERC20 token,
+    IERC20 token,
     address spender,
     uint256 addedValue
   )
@@ -56,7 +56,7 @@ library SafeERC20 {
   }
 
   function safeDecreaseAllowance(
-    ISafeERC20 token,
+    IERC20 token,
     address spender,
     uint256 subtractedValue
   )