diff --git a/public/javascripts/ie.js b/public/javascripts/ie.js
index 330c8be04..8f2976a79 100644
--- a/public/javascripts/ie.js
+++ b/public/javascripts/ie.js
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
 var elements = new Array('header','footer','article','nav','section');
 
-for(var element in elements) { document.createElement(elements[element]); }
\ No newline at end of file
+for(var element in elements) { document.createElement(elements[element]); }
+=======
+document.createElement('header');
+document.createElement('footer');
+>>>>>>> parent of 2e9aab1... Added some more HTML5 elements so no suprises in the future