resolve merge conflicts

Author: thal0x

AxelarHandler/src/libraries/SkipSwapRouter.sol

@@ -23,7 +23,9 @@ library SkipSwapRouter {
         bytes memory swapData
     ) public returns (uint256 amountOut) {
         uint256 preBalIn = IERC20(inputToken).balanceOf(address(this)) - amountIn;
-        uint256 preBalOut = IERC20(outputToken).balanceOf(address(this));
+
+        uint256 preBalOut =
+            outputToken == address(0) ? address(this).balance : IERC20(outputToken).balanceOf(address(this));
 
         IERC20(inputToken).forceApprove(router, amountIn);
 
@@ -33,7 +35,11 @@ library SkipSwapRouter {
             _revertWithData(returnData);
         }
 
-        amountOut = IERC20(outputToken).balanceOf(address(this)) - preBalOut;
+        if (outputToken == address(0)) {
+            amountOut = address(this).balance - preBalOut;
+        } else {
+            amountOut = IERC20(outputToken).balanceOf(address(this)) - preBalOut;
+        }
 
         uint256 dust = IERC20(inputToken).balanceOf(address(this)) - preBalIn;