diff --git a/handbook/company/leadership.md b/handbook/company/leadership.md
index d89b81639f..1cad2e84de 100644
--- a/handbook/company/leadership.md
+++ b/handbook/company/leadership.md
@@ -414,7 +414,6 @@ Although it's sad to see someone go, Fleet understands that not everything is me
 4. **CEO**: The CEO will make an announcement during the "🌈 Weekly Update" post on Friday in the `#general` channel on Slack. 
 
 
-<<<<<<< HEAD
 ## Changing someone's position
 From time to time, someone's job title changes.  To do this, reach out to [Digital Experience](https://fleetdm.com/handbook/digital-experience).