diff --git a/checks/check28 b/checks/check28
index f2e10eb8..bec0e234 100644
--- a/checks/check28
+++ b/checks/check28
@@ -11,10 +11,7 @@
 CHECK_ID_check28="2.8,2.08"
 CHECK_TITLE_check28="[check28] Ensure rotation for customer created CMKs is enabled (Scored)"
 CHECK_SCORED_check28="SCORED"
-<<<<<<< HEAD
-=======
 CHECK_TYPE_check28="LEVEL2"
->>>>>>> 3a6cc73319189063d51ffa9a4e25e28f1d55d668
 CHECK_ALTERNATE_check208="check28"
 
 check28(){