From 4e9322c1e5287462427aec2cd805002b49877694 Mon Sep 17 00:00:00 2001
From: Shrenuj Bansal <shrenuj.bansal@protocol.ai>
Date: Tue, 6 Dec 2022 17:55:52 -0500
Subject: [PATCH] remove conflict remnant

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4071bbb98..8380af13e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -130,7 +130,6 @@ If so, this check is introduced via [#9032](https://github.com/filecoin-project/
 ## Bug Fixes
 
 - fix: cli: check found before dereferencing SectorInfo #9703
->>>>>>> release/v1.18.1
 
 # 1.18.0 / 2022-11-15