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