diff --git a/uw_cfg_common.module b/uw_cfg_common.module
index aecdbdd4389e6d305660b7ea06d48934c67225ee..e567ac5042f7688156560aeaacf2a2b02bfbc5f5 100644
--- a/uw_cfg_common.module
+++ b/uw_cfg_common.module
@@ -757,11 +757,7 @@ function uw_cfg_common_preprocess_responsive_image(&$variables) {
     else {
 
       // Get the styles used for responsive.
-<<<<<<< HEAD
-      $uw_styles = \Drupal::service('uw_cfg_common.uw_service')->getCropImageStyles('portrait');
-=======
       $uw_styles = \Drupal::service('uw_cfg_common.uw_service')->getCropImageStyles('responsive');
->>>>>>> origin/feature/ISTWCMS-5206/ebremner-contacts-listing-page-image-theming
     }
 
     // Step through each of the sources and see if we are.