diff --git a/uw_cfg_common.module b/uw_cfg_common.module
index 90ba079b85d56272dc10f295d22a65ca50652178..aecdbdd4389e6d305660b7ea06d48934c67225ee 100644
--- a/uw_cfg_common.module
+++ b/uw_cfg_common.module
@@ -1,4 +1,4 @@
-<?php
+?php
 
 /**
  * @file
@@ -733,15 +733,6 @@ function uw_cfg_common_preprocess_responsive_image(&$variables) {
   // Explode the current path so we can check where we are.
   $current_path_parts = explode('/', $current_path);
 
-<<<<<<< HEAD
-  // If the current path has a node, we need to alter
-  // the image styles.
-  if ($current_path_parts[1] == 'node') {
-
-    // Get the media library parameters, we will use this
-    // if we are on a media library page/modal.
-    $media_lib_parameters = \Drupal::request()->query->get('media_library_opener_parameters');
-=======
   // Get the media library parameters, we will use this
   // if we are on a media library page/modal.
   $media_lib_parameters = \Drupal::request()->query->get('media_library_opener_parameters');
@@ -752,7 +743,6 @@ function uw_cfg_common_preprocess_responsive_image(&$variables) {
     $current_path_parts[1] == 'node' ||
     $media_lib_parameters
   ) {
->>>>>>> origin/feature/ISTWCMS-5206/ebremner-contacts-listing-page-image-theming
 
     // If we are on a contact image, remove all styles
     // but those for portraits.