diff --git a/CNAME b/CNAME
index d6b9bda..b53ae35 100644
--- a/CNAME
+++ b/CNAME
@@ -1,5 +1 @@
-<<<<<<< HEAD
 projectfirewatch.com
-=======
-projectfirewatch.com
->>>>>>> parent of 24f98f1 (Revert "Update CNAME")