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