diff --git a/www/src/page-layout.html b/www/src/page-layout.html
index 28ffde56..b15de302 100644
--- a/www/src/page-layout.html
+++ b/www/src/page-layout.html
@@ -9,7 +9,11 @@
{{ config.mail_domain }} {{ pagename }}
+<<<<<<< HEAD
+=======
+
+>>>>>>> 2da7de8 (make logo slightly brighter)