diff --git a/functions.php b/functions.php
index 96cb5fc..6c154f0 100644
--- a/functions.php
+++ b/functions.php
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php
 /**
  * cornerstone functions and definitions
@@ -188,4 +187,4 @@ function load_custom_wp_admin_style($hook) {
 }
 add_action( 'admin_enqueue_scripts', 'load_custom_wp_admin_style' );
 
-add_theme_support( 'post-thumbnails' ); 
\ No newline at end of file
+add_theme_support( 'post-thumbnails' );