diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc38fd10ba..f7f1c96109 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,17 +53,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 ### Changed
 - Refactored the Traffic Ops Go client internals so that all public methods have a consistent behavior/implementation
 - Pinned external actions used by Documentation Build and TR Unit Tests workflows to commit SHA-1 and the Docker image used by the Weasel workflow to a SHA-256 digest
-<<<<<<< HEAD
-=======
-- Updated Flot libraries to supported versions
-- [apache/trafficcontrol](https://github.com/apache/trafficcontrol) is now a Go module
 - Set Traffic Router to only accept TLSv1.1 and TLSv1.2 protocols in server.xml
 - Updated Apache Tomcat from 8.5.57 to 8.5.63
 - Updated Apache Tomcat Native from 1.2.16 to 1.2.23
 
-### Removed
-- The Perl implementation of Traffic Ops has been stripped out, along with the Go implementation's "fall-back to Perl" behavior.
->>>>>>> 594d25450 (Update Tomcat to 8.5.63 (#5535))
 
 ## [5.0.0] - 2020-10-20
 ### Added