Conflicts are too numerous to list, but they are all caused by upstream's theming changes and all have to do with the differences between upstream and glitch-soc in the theming systems. They were all manually resolved by adapting the relevant code.
Web::PushNotificationWorker
Style/OptionalBooleanParameter
Style/GuardClause