From 8d100611f5f8aea4b2f0f9cc6e705dc8a6af9f5c Mon Sep 17 00:00:00 2001
From: soloseng <102702451+soloseng@users.noreply.github.com>
Date: Wed, 20 Nov 2024 12:14:37 -0500
Subject: [PATCH] =?UTF-8?q?fixed=20=E2=88=86=20from=20merge=20conflict?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/protocol/test-sol/unit/common/GoldToken.t.sol        | 4 ++--
 .../test-sol/unit/governance/network/EpochRewards.t.sol       | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/protocol/test-sol/unit/common/GoldToken.t.sol b/packages/protocol/test-sol/unit/common/GoldToken.t.sol
index c0f34013d9..8d3cbf9cb6 100644
--- a/packages/protocol/test-sol/unit/common/GoldToken.t.sol
+++ b/packages/protocol/test-sol/unit/common/GoldToken.t.sol
@@ -3,10 +3,10 @@ pragma solidity ^0.5.13;
 
 import "@celo-contracts/common/GoldToken.sol";
 
-import { Utils } from "@test-sol/utils.sol";
+import { TestWithUtils } from "@test-sol/TestWithUtils.sol";
 import "@test-sol/utils/WhenL2.sol";
 
-contract CeloTokenTest is Utils {
+contract CeloTokenTest is TestWithUtils {
   GoldToken celoToken;
 
   uint256 constant ONE_CELOTOKEN = 1000000000000000000;
diff --git a/packages/protocol/test-sol/unit/governance/network/EpochRewards.t.sol b/packages/protocol/test-sol/unit/governance/network/EpochRewards.t.sol
index d7fd890440..8aaf717745 100644
--- a/packages/protocol/test-sol/unit/governance/network/EpochRewards.t.sol
+++ b/packages/protocol/test-sol/unit/governance/network/EpochRewards.t.sol
@@ -13,6 +13,7 @@ import { MockStableToken } from "@celo-contracts/stability/test/MockStableToken.
 import { CeloTokenMock } from "@test-sol/unit/common/CeloTokenMock.sol";
 
 import { TestWithUtils } from "@test-sol/TestWithUtils.sol";
+import "@test-sol/utils/WhenL2.sol";
 
 contract EpochRewardsTest is TestWithUtils {
   uint256 constant targetVotingYieldParamsInitial = 0.00016e24; // 0.00016