Fixed it

Was broken, now fixed

404.php

@@ -14,11 +14,7 @@ get_header(); ?>
 
 			<section class="error-404 not-found">
 				<header class="page-header">
-<<<<<<< HEAD
-					<h1 class="page-title"><?php _e( 'Sorry! That page can&rsquo;t be found.', 'twentyfifteen' ); ?></h1>
-=======
-					<h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found..', 'twentyfifteen' ); ?></h1>
->>>>>>> origin/master
+					<h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'twentyfifteen' ); ?></h1>
 				</header><!-- .page-header -->
 
 				<div class="page-content">			
@@ -31,4 +27,4 @@ get_header(); ?>
 		</main><!-- .site-main -->
 	</div><!-- .content-area -->
 
-<?php get_footer(); ?>
+<?php get_footer(); ?>