diff --git a/src/mcp_obsidian/tools.py b/src/mcp_obsidian/tools.py
index a7b8818..d5b172a 100644
--- a/src/mcp_obsidian/tools.py
+++ b/src/mcp_obsidian/tools.py
@@ -541,13 +541,8 @@ class PeriodicNotesToolHandler(ToolHandler):
         if type not in valid_types:
             raise RuntimeError(f"Invalid type: {type}. Must be one of: {', '.join(valid_types)}")
 
-<<<<<<< ours
         api = create_obsidian_api()
         content = api.get_periodic_note(period)
-=======
-        api = create_obsidian_api()
-        content = api.get_periodic_note(period)
->>>>>>> theirs
 
         return [
             TextContent(