There is another option:
- Downsize the office to better fit with the number of people who do actually want to be in the office, either full or part time, and don’t cause a huge ruckus about people who prefer to work remotely.
At my job, most people are in the office 2-3 days a week, but there are a few who are there nearly every day. We also have some people who are remote/WFH, including a few who are remote even though they live very near by.
Or the comment sections could just be merged together in the client view. Each thread of comments would belong to one (and only one) instance, so it shouldn’t be difficult to merge those lists together when presenting the aggregate view to the user.