diff --git a/SPECS/shim.spec b/SPECS/shim.spec
index e4267b6..194fd9b 100644
--- a/SPECS/shim.spec
+++ b/SPECS/shim.spec
@@ -146,7 +146,6 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
   Resolves: rhbz#1982071
   Resolves: rhbz#2000946
   Resolves: rhbz#2002265
->>>>>>> c8
 
 * Mon Sep 21 2020 Javier Martinez Canillas <javierm@redhat.com> - 15-16
 - Fix an incorrect allocation size