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.
spec/helpers
DatabaseHelper
filter_keywords
Lint/NonLocalExitFromIterator
valid_locale_or_nil
config_for