diff --git a/errs/code/scope.go b/errs/code/scope.go
index 8a722e6..30e5703 100644
--- a/errs/code/scope.go
+++ b/errs/code/scope.go
@@ -6,8 +6,5 @@ const (
 	CloudEPPortalGW
 	CloudEPMember
 	CloudEPPermission
-<<<<<<< HEAD
 	CloudEPNotification
-=======
->>>>>>> refs/remotes/origin/main
 )