diff --git a/mkdocs_with_confluence/plugin.py b/mkdocs_with_confluence/plugin.py
index 5e50311..6f0f340 100644
--- a/mkdocs_with_confluence/plugin.py
+++ b/mkdocs_with_confluence/plugin.py
@@ -17,10 +17,7 @@ from mkdocs.plugins import BasePlugin
 from md2cf.confluence_renderer import ConfluenceRenderer
 from os import environ
 from pathlib import Path
-<<<<<<< HEAD
-=======
 from loguru import logger
->>>>>>> 0153901 (Upload attachments on post page to support other mkdocs plugins (#15))
 
 ENABLE_ENV_VAR = "MKDOCS_TO_CONFLUENCE"
 DRY_RUN_ENV_VAR = "MKDOCS_TO_CONFLUENCE_DRY_RUN"