diff --git a/_layouts/landing.html b/_layouts/landing.html
index 9bcce22..dac4063 100644
--- a/_layouts/landing.html
+++ b/_layouts/landing.html
@@ -57,6 +57,7 @@
 					</div>
 				</section>
 
+<<<<<<< HEAD
 				<section>
 					<div class="center">
 						<div class="capsule">what we do</div>