diff --git a/.gitignore b/.gitignore
index 7a14487..628b6f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,10 @@ __pycache__
 .venv
 .aider*
 .vscode
+<<<<<<< HEAD
 .zed
 pyproject.toml
 .ropeproject
+=======
+generated_files/*
+>>>>>>> d45f0be (env set up for remote)
diff --git a/src/ai_generators/ollama_md_generator.py b/src/ai_generators/ollama_md_generator.py
index 762b8f4..e58e170 100644
--- a/src/ai_generators/ollama_md_generator.py
+++ b/src/ai_generators/ollama_md_generator.py
@@ -157,8 +157,14 @@ class OllamaGenerator:
                 ])
 
             # the deepseek model returns <think> this removes those tabs from the output
+<<<<<<< HEAD
             return re.sub(r"<think|.\n\r+?|([^;]*)\/think>",'',self.response['message']['content'])
 >>>>>>> e1a24af (get rid of think tags)
+=======
+            # return re.sub(r"<think|.\n\r+?|([^;]*)\/think>",'',self.response['message']['content'])
+            return self.response['message']['content']
+
+>>>>>>> d45f0be (env set up for remote)
 
         except Exception as e:
             raise Exception(f"Failed to generate markdown: {e}")
diff --git a/src/main.py b/src/main.py
index 07817fc..16faed5 100644
--- a/src/main.py
+++ b/src/main.py
@@ -21,6 +21,7 @@ for note in tril_notes:
     print("Generating Document")
 
     os_friendly_title = convert_to_lowercase_with_underscores(tril_notes[note]['title'])
+<<<<<<< HEAD
     ai_gen = omg.OllamaGenerator(os_friendly_title,
                                  tril_notes[note]['content'],
                                  tril_notes[note]['title'])
@@ -32,3 +33,6 @@ for note in tril_notes:
     git_pass = os.environ["GIT_PASS"]
     repo_manager = git_repo.GitRepository("blog/", git_user, git_pass)
     repo_manager.create_copy_commit_push(blog_path, os_friendly_title, commit_message)
+=======
+    ai_gen.save_to_file(f"./generated_files/{os_friendly_title}.md")
+>>>>>>> d45f0be (env set up for remote)