diff --git a/view/template/page/team.php b/view/template/page/team.php
index cadc0d5b..66258d0e 100644
--- a/view/template/page/team.php
+++ b/view/template/page/team.php
@@ -30,11 +30,7 @@
       </div>
     <?php endforeach ?>
     <h2>Business</h2>
-<<<<<<< HEAD
-    <?php foreach(['josh-finer',
-=======
     <?php foreach (['josh-finer',
->>>>>>> master
                     'tom-zarebczan',
                     'brinck-slattery',
                     'rob-smith',