From 3390e3536d0858b13e616bafa920531896cb282b Mon Sep 17 00:00:00 2001
From: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
Date: Mon, 24 Apr 2023 15:29:32 +0800
Subject: [PATCH] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 650becb25..500f41619 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -606,10 +606,6 @@ verifiedregistry  bafk2bzacedej3dnr62g2je2abmyjg3xqv4otvh6e26du5fcrhvw7zgcaaez3a
 ### Dependencies
 github.com/filecoin-project/go-state-types (v0.11.0-rc1 -> v0.11.1):
 
-<<<<<<< HEAD
-=======
-
->>>>>>> releases
 # v1.20.4 / 2023-03-17
 
 This is a patch release intended to alleviate performance issues reported by some users since the nv18 upgrade.