diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15efb30bc..1de635ded 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,17 +3,14 @@ v2.6.3 (FUTURE)
 ## Bug Fixes
 
 * [#3420](https://github.com/netbox-community/netbox/issues/3420) - Serial number filter for racks, devices, and inventory items is now case-insensitive
-<<<<<<< HEAD
 * [#3428](https://github.com/netbox-community/netbox/issues/3420) - Fixed cache invalidation issues ([#3300](https://github.com/netbox-community/netbox/issues/3300), [#3363](https://github.com/netbox-community/netbox/issues/3363), [#3379](https://github.com/netbox-community/netbox/issues/3379), [#3382](https://github.com/netbox-community/netbox/issues/3382)) by switching to `prefetch_related()` instead of `select_related()` and removing use of `update()`
-=======
 * [#3421](https://github.com/netbox-community/netbox/issues/3421) - Fix exception when ordering power connections list by PDU
 * [#3424](https://github.com/netbox-community/netbox/issues/3424) - Fix tag coloring for non-linked tags
 * [#3426](https://github.com/netbox-community/netbox/issues/3426) - Improve API error handling for ChoiceFields
->>>>>>> develop
 
 ## Enhancements
 
-* [#3386](https://github.com/netbox-community/netbox/issues/3386) - Add `mac_address` filter for virtual machines
+* [#3386](https://github.com/netbox-community/netbox/issues/3386) - Add `mac_address` filter for virtual machineså
 * [#3391](https://github.com/netbox-community/netbox/issues/3391) - Update Bootstrap CSS to v3.4.1
 * [#3405](https://github.com/netbox-community/netbox/issues/3405) - Fix population of power port/outlet details on device creation
 * [#3422](https://github.com/netbox-community/netbox/issues/3422) - Prevent navigation menu from overlapping page content