diff --git a/public/javascripts/ie.js b/public/javascripts/ie.js
index 8f2976a79..86009f067 100644
--- a/public/javascripts/ie.js
+++ b/public/javascripts/ie.js
@@ -1,8 +1,2 @@
-<<<<<<< HEAD
-var elements = new Array('header','footer','article','nav','section');
-
-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
+document.createElement('footer');
\ No newline at end of file