diff --git a/.eleventy.js b/.eleventy.js
index 36e3eee..ec6c62d 100644
--- a/.eleventy.js
+++ b/.eleventy.js
@@ -64,10 +64,14 @@ module.exports = function(eleventyConfig) {
   eleventyConfig.addPassthroughCopy("img");
   eleventyConfig.addPassthroughCopy("css");
 <<<<<<< HEAD
+<<<<<<< HEAD
   
 =======
   eleventyConfig.addPassthroughCopy({ "img/favicon/favicon.ico": "/" });
 >>>>>>> f65ab54f6b56b2b4205dd94542e2ff00c4a5465a
+=======
+  
+>>>>>>> 9843c4c48624f1f4e4fa78a94f078d49689353d4
 
   // Customize Markdown library and settings:
   let markdownLibrary = markdownIt({