diff --git a/CNAME b/CNAME
index 91f409d..4030873 100644
--- a/CNAME
+++ b/CNAME
@@ -1 +1,5 @@
+<<<<<<< HEAD
 mtlgamejam.org
+=======
+mtlgamejam.org
+>>>>>>> 59719ad6e5371ff3f4233369db5c6749e1d3970b