diff --git a/css/r11form.css b/css/r11form.css
index d043bb1..45f403a 100644
--- a/css/r11form.css
+++ b/css/r11form.css
@@ -436,3 +436,10 @@
     display: inherit;
 }
 
+<<<<<<< HEAD
+=======
+/* In case of collision with classes that use 'active' */
+.hidden {
+    display: none;
+}
+>>>>>>> 1798170ab4bdb863e9ee7617a06854c02e00e67f