diff --git a/changelog.md b/changelog.md
index d14c7bd6..403afc20 100644
--- a/changelog.md
+++ b/changelog.md
@@ -25,7 +25,6 @@ Fix preview of Controller Input Display
 ## Feb 23, 2023
 ### Updated 'Force Plaza Events'
 Set the correct BH/RH/GB unlock flag
->>>>>>> gct/master
 
 ## Feb 21, 2023
 Disable Z menu for Instant Level Select to prevent broken texture