diff --git a/themes/danbooru/layout.class.php b/themes/danbooru/layout.class.php
index 45bcd96f..519f80a5 100644
--- a/themes/danbooru/layout.class.php
+++ b/themes/danbooru/layout.class.php
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:themes/danbooru/layout.class.php
 <?php
 /**
 * Name: Danbooru Theme