diff --git a/normalize.css b/normalize.css
index 5c4be086c..c291d77df 100644
--- a/normalize.css
+++ b/normalize.css
@@ -213,7 +213,15 @@ details {
   display: block;
 }
 
+<<<<<<< HEAD
 summary {
+=======
+/*
+ * Add the correct display in all browsers.
+ */
+
+details > summary:first-of-type {
+>>>>>>> b69b8157d8af3fb50a36bc10affc724ae0022ef7
   display: list-item;
 }