Fix Merge Conflicts #1289

Job	Run time
Publish Shoko.Plugin.Abstractions Nuget (8.x)	1m 48s
Current Information	10s
Build Tray Service — Standalone (Daily)	3m 38s
Build Tray Service — Installer (Daily) (8.x)	4m 15s
Build Docker Image - amd64 (Daily)	1m 16s
Build CLI — Standalone linux-x64 (Daily)	1m 4s
Build Docker Image - arm64 (Daily)	2m 23s
Build CLI — Standalone linux-arm64 (Daily)	1m 6s
Build Tray Service — Framework (Daily)	3m 39s
Build CLI — Framework linux-x64 (Daily)	57s
Push combined tag for both docker images	4s
Add tag for pre-release	9s
Upload version info to Sentry.io	9s
Send notifications about the new daily build	2s
Upload archive to site	32s
	21m 12s

Provide feedback