fix merge conflicts

diff --cc src/server/handlers/catch-all-handler.tsx
index e57f079d8938d85737e3bdf6c8b1f1c36335161f,efadee42b52f773f5f7c66b7e259500c028c7c74..f22b8a1734f55ed84475dc3d1bccb30045f9fd43
--- 1/src/server/handlers/catch-all-handler.tsx
--- 2/src/server/handlers/catch-all-handler.tsx
+++ b/src/server/handlers/catch-all-handler.tsx
@@@ -1,6 -1,6 +1,7 @@@
  import { initializeSite, isAuthPath } from "@utils/app";
 +import { getHttpBaseInternal } from "@utils/env";
  import { ErrorPageData } from "@utils/types";
+ import fetch from "cross-fetch";
  import type { Request, Response } from "express";
  import { StaticRouter, matchPath } from "inferno-router";
  import { renderToString } from "inferno-server";

diff --cc src/server/handlers/manifest-handler.ts
index 014e0348bf69037b554559da97f748519bbfe6c0,b9a11089cf4baa096011370781f84da857cda659..c1756f7570661fadad4e532336b1a767c439d5c5
--- 1/src/server/handlers/manifest-handler.ts
--- 2/src/server/handlers/manifest-handler.ts
+++ b/src/server/handlers/manifest-handler.ts
@@@ -1,6 -1,7 +1,7 @@@
 +import { getHttpBaseExternal, getHttpBaseInternal } from "@utils/env";
+ import fetch from "cross-fetch";
  import type { Request, Response } from "express";
  import { LemmyHttp } from "lemmy-js-client";
 -import { getHttpBaseExternal, getHttpBaseInternal } from "../../shared/env";
  import { wrapClient } from "../../shared/services/HttpService";
  import generateManifestJson from "../utils/generate-manifest-json";
  import { setForwardedHeaders } from "../utils/set-forwarded-headers";

diff --cc src/shared/components/post/post-listing.tsx
index 8e4d730383666add8bc0dd0c46154c43c03b23ef,b9ad5ebc0f428d6b1569e27bc5a3348a6fe006b6..4d0951bb60ae4619da1347b0ead74fc2a7f71b32
--- 1/src/shared/components/post/post-listing.tsx
--- 2/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@@ -1,7 -1,11 +1,12 @@@
  import { myAuthRequired, newVote, showScores } from "@utils/app";
  import { canShare, share } from "@utils/browser";
- import { futureDaysToUnixTime, hostname, numToSI } from "@utils/helpers";
 +import { getExternalHost, getHttpBase } from "@utils/env";
+ import {
+   capitalizeFirstLetter,
+   futureDaysToUnixTime,
+   hostname,
+   numToSI,
+ } from "@utils/helpers";
  import { isImage, isVideo } from "@utils/media";
  import {
    amAdmin,