diff --git a/app/jobs/index.html b/app/jobs/index.html
index 6d054daf..e2c6333f 100644
--- a/app/jobs/index.html
+++ b/app/jobs/index.html
@@ -171,12 +171,7 @@ <h2 class="h2">Research Positions</h2>
               <p>
                 <strong>Research Assistants:</strong> We're seeking paid research assistants with a web
                 development background to help us build open source legal
-                tech and civic tech tools
-<<<<<<< HEAD
-                like <a href="/projects/perma-cc" class="interactive-link dark reverse">Perma.cc</a>, <a href="/projects/h2o>opencasebook.org" class="interactive-link dark reverse">opencasebook.org</a>,
-=======
-                like <a href="/projects/perma-cc" class="interactive-link dark reverse">Perma.cc</a>, <a href="/projects/h2o" class="interactive-link dark reverse">opencasebook.org</a>,
->>>>>>> 5178740bdc7bdda0d635d9ac7676d202eadb6963
+                tech and civic tech tools like <a href="/projects/perma-cc" class="interactive-link dark reverse">Perma.cc</a>, <a href="/projects/h2o>opencasebook.org" class="interactive-link dark reverse">opencasebook.org</a>,
                 and <a href="/projects/caselaw-access-project" class="interactive-link dark reverse">Case.law</a>.
               </p>
               <p>