From 787302e80d35c1b41d62a9119110a281c5dbe1c8 Mon Sep 17 00:00:00 2001
From: Brechtpd <Brechtp.devos@gmail.com>
Date: Tue, 25 Jun 2024 04:29:35 +0200
Subject: [PATCH] cleanup diff

---
 CHANGELOG.md                                | 5 +----
 crates/interpreter/src/instructions/i256.rs | 8 --------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20c44a89c7..edbcae5bdd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,5 @@
 Because this is workspace with multi libraries, tags will be simplified, and with this document you can match version of project with git tag.
 
-<<<<<<< HEAD
-=======
 # v36 tag
 date: 12.05.2024
 
@@ -19,7 +17,6 @@ revm-primitives: 3.1.1 -> 4.0.0 (⚠️ API breaking changes)
 revm-precompile: 6.0.0 -> 7.0.0 (⚠️ API breaking changes)
 revm-test: 0.1.0
 
->>>>>>> v36
 # v35 tag
 date: 02.04.2024
 
@@ -262,7 +259,7 @@ date: 20.1.2022
 
 # v3 tag
 
-* revm: v1.0.0 
+* revm: v1.0.0
 * revme: v0.1.0
 
 # v2 tag
diff --git a/crates/interpreter/src/instructions/i256.rs b/crates/interpreter/src/instructions/i256.rs
index 929216ab1e..d7f72446d9 100644
--- a/crates/interpreter/src/instructions/i256.rs
+++ b/crates/interpreter/src/instructions/i256.rs
@@ -134,14 +134,6 @@ mod tests {
     use super::*;
     use crate::primitives::uint;
     use core::num::Wrapping;
-    use revm_primitives::uint;
-
-    const MAX_POSITIVE_VALUE: U256 = U256::from_limbs([
-        0xffffffffffffffff,
-        0xffffffffffffffff,
-        0xffffffffffffffff,
-        0x7fffffffffffffff,
-    ]);
 
     #[test]
     fn div_i256() {