Merge branch 'main' into support/merge-error

Author: skwowet

frontend/src/modules/member/components/member-merge-suggestions.vue

@@ -199,7 +199,7 @@ const preview = computed(() => {
     ...secondaryMember.identities,
   ];
   mergedMembers.score = Math.max(primaryMember.score, secondaryMember.score);
-  mergedMembers.activityCount = primaryMember.activityCount + secondaryMember.activityCount;
+  mergedMembers.activityCount = +primaryMember.activityCount + +secondaryMember.activityCount;
   return mergedMembers;
 });