diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module
index c2dd61d..616e599 100644
--- a/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -5,11 +5,7 @@
  * Responsive image display formatter for image fields.
  */
 
-<<<<<<< HEAD
-use Drupal\breakpoint\Entity\Breakpoint;
 use Drupal\Component\Utility\SafeMarkup;
-=======
->>>>>>> july20
 use Drupal\Core\Routing\RouteMatchInterface;
 use \Drupal\Core\Template\Attribute;