diff --git a/content/staff/chris-and-abbie-cochrun/_index.md b/content/staff/chris-and-abbie-cochrun/_index.md
index a70ee3b..8d7a648 100644
--- a/content/staff/chris-and-abbie-cochrun/_index.md
+++ b/content/staff/chris-and-abbie-cochrun/_index.md
@@ -23,10 +23,8 @@ weight: 70
 
 Chris and Abbie Cochrun serve together on TFC Staff! Chris grew up in Agra KS as a part of the Eastern Heights TFC group, Abbie grew up as a part of the Northern Valley TFC group and they got to know each other through TFC! Chris handles a lot of IT and video related things for TFC and Abbie is TFC’s unofficial graphic designer.
 
-<<<<<<< HEAD:content/staff/chris-and-abbie-cochrun/index.md
 You can check out my own website at [cochrun.xyz](https://cochrun.xyz)!
-=======
+
 If you'd like to read our newsletters, check them out here!
 
 {{< spacing >}}
->>>>>>> 3b7e397 (updates to blowfish and adding newsletters in cochrun page):content/staff/chris-and-abbie-cochrun/_index.md