diff --git a/themes/danbooru/layout.class.php b/themes/danbooru/layout.class.php
index 595e093c..45bcd96f 100644
--- a/themes/danbooru/layout.class.php
+++ b/themes/danbooru/layout.class.php
@@ -1,3 +1,4 @@
+<<<<<<< HEAD:themes/danbooru/layout.class.php
 <?php
 /**
 * Name: Danbooru Theme
@@ -53,6 +54,7 @@ class Layout {
 
 
 		$header_html = "";
+		ksort($page->headers);
 		foreach($page->headers as $line) {
 			$header_html .= "\t\t$line\n";
 		}
diff --git a/themes/futaba/layout.class.php b/themes/futaba/layout.class.php
index ea53c3db..668efc6a 100644
--- a/themes/futaba/layout.class.php
+++ b/themes/futaba/layout.class.php
@@ -9,6 +9,7 @@ class Layout {
 		$contact_link = $config->get_string('contact_link');
 
 		$header_html = "";
+		ksort($page->headers);
 		foreach($page->headers as $line) {
 			$header_html .= "\t\t$line\n";
 		}
diff --git a/themes/old_default/layout.class.php b/themes/old_default/layout.class.php
index 77463777..d29de895 100644
--- a/themes/old_default/layout.class.php
+++ b/themes/old_default/layout.class.php
@@ -9,6 +9,7 @@ class Layout {
 		$contact_link = $config->get_string('contact_link');
 
 		$header_html = "";
+		ksort($page->headers);
 		foreach($page->headers as $line) {
 			$header_html .= "\t\t$line\n";
 		}