fix: resolve conflict

Server/service/stringService.js

@@ -249,11 +249,14 @@ class StringService {
     return this.translationService.getTranslation('statusPageUpdate');
   }
 
-
   get statusPageNotFound() {
     return this.translationService.getTranslation('statusPageNotFound');
   }
 
+  get statusPageByTeamId() {
+    return this.translationService.getTranslation('statusPageByTeamId');
+  }
+
   get statusPageUrlNotUnique() {
     return this.translationService.getTranslation('statusPageUrlNotUnique');
   }