diff --git a/src/main.py b/src/main.py
index 16faed5..07817fc 100644
--- a/src/main.py
+++ b/src/main.py
@@ -21,7 +21,6 @@ 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'])
@@ -33,6 +32,3 @@ 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)