ci: restore some changes lost in a merge conflict#2802

mcansh merged 1 commit intomainremix-run/remix:mainfrom

logan/fix-some-merge-conflict-lossesremix-run/remix:logan/fix-some-merge-conflict-lossesCopy head branch name to clipboard